diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 24a9d345..cb9c4eec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,9 +54,14 @@ jobs:
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
+      - name: Docker login
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_HUB_NAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push Docker image
-        if: steps.build-encode.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch'
+        if: (steps.build-encode.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
         uses: docker/build-push-action@v2
         with:
           context: ./Encode
@@ -97,16 +102,22 @@ jobs:
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
+      - name: Docker login
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_HUB_NAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
       - name: Build and push Docker image
-        if: steps.build-reader.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch'
+        if: (steps.build-reader.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
         uses: docker/build-push-action@v2
         with:
           context: ./Reader
           push: true
           tags: |
-            bskjon/media-processing--reader:latest
-            bskjon/media-processing--reader:${{ github.sha }}
-            bskjon/media-processing--reader:${{ steps.docker-tag.outputs.tag }}
+            bskjon/mediaprocessing-reader:latest
+            bskjon/mediaprocessing-reader:${{ github.sha }}
+            bskjon/mediaprocessing-reader:${{ steps.docker-tag.outputs.tag }}
 
   build-pymetadata:
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
@@ -136,13 +147,19 @@ jobs:
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
+      - name: Docker login
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_HUB_NAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
       - name: Build and push Docker image
-        if: steps.build-pymetadata.outputs.job_skipped != 'true' || github.event_name == 'workflow_dispatch'
+        if: (steps.build-pymetadata.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
         uses: docker/build-push-action@v2
         with:
           context: ./pyMetadata
           push: true
           tags: |
-            bskjon/media-processing--pymetadata:latest
-            bskjon/media-processing--pymetadata:${{ github.sha }}
-            bskjon/media-processing--pymetadata:${{ steps.docker-tag.outputs.tag }}
+            bskjon/mediaprocessing-pymetadata:latest
+            bskjon/mediaprocessing-pymetadata:${{ github.sha }}
+            bskjon/mediaprocessing-pymetadata:${{ steps.docker-tag.outputs.tag }}