diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d3667af6..0502669d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,27 +89,29 @@ jobs:
   deploy:
     docker:
       - image: circleci/buildpack-deps:stretch
+    parameters:
+      docker-variant:
+        type: string
     steps:
       - checkout
       - setup_remote_docker: # https://circleci.com/docs/2.0/building-docker-images/
           docker_layer_caching: true
-      - run: make docker
-      - run: make docker-cuda
+      - run: make docker<< parameters.docker-variant >>
       - run:
           name: Login to Docker Hub
           command: echo "$DOCKERHUB_PASS" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
-      - run: docker push ocrd/core:latest
-      - run: docker push ocrd/core-cuda:latest
-      - run: docker tag ocrd/core ocrd/core:$(git describe --tags --abbrev=0)
-      - run: docker tag ocrd/core-cuda ocrd/core-cuda:$(git describe --tags --abbrev=0)
-      - run: docker push ocrd/core:$(git describe --tags --abbrev=0)
-      - run: docker push ocrd/core-cuda:$(git describe --tags --abbrev=0)
+      - run: docker push ocrd/core<< parameters.docker-variant >>:latest
+      - run: docker tag ocrd/core<< parameters.docker-variant >> ocrd/core<< parameters.docker-variant >>:$(git describe --tags --abbrev=0)
+      - run: docker push ocrd/core<< parameters.docker-variant >>:$(git describe --tags --abbrev=0)
 
 workflows:
   version: 2
   build-master:
     jobs:
       - deploy:
+          matrix:
+            parameters:
+              docker-variant: ['', '-cuda', '-cuda-tf1', '-cuda-tf2', '-cuda-torch']
           filters:
             branches:
               only: master