diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 709ab29..eb1a438 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -18,6 +18,26 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag b4tman/squid:$(date +%s)
+      run: docker build . --file Dockerfile --tag b4tman/squid
     - name: Test image
       run: docker-compose -f docker-compose.test.yml up sut
+    - name: Build 'ssl-bump' Docker image
+      run: docker build ssl-bump --tag b4tman/squid:ssl-bump
+    - name: GituHub Packages - Docker Login
+      if:  github.event_name == 'push'
+      run: docker login docker.pkg.github.com -u ${{secrets.GITHUB_PKGS_LOGIN}} -p ${{secrets.GITHUB_PKGS_TOKEN}}
+    - name: GituHub Packages - Docker Tag
+      if:  github.event_name == 'push'
+      run: docker tag b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Tag 'ssl-bump'
+      if:  github.event_name == 'push'
+      run: docker tag b4tman/squid:ssl-bump docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Push
+      if:  github.event_name == 'push'
+      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Push 'ssl-bump'
+      if:  github.event_name == 'push'
+      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Logout
+      if:  github.event_name == 'push'
+      run: docker logout docker.pkg.github.com