diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml
index b9a10be582..82e4a514d0 100644
--- a/.github/workflows/github_action_test_suite.yml
+++ b/.github/workflows/github_action_test_suite.yml
@@ -106,3 +106,33 @@ jobs:
       with:
         project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
         coverage-reports: ./testing_mygame/coverage.xml
+        
+    # docker setup and push
+    -
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    -
+      name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    -
+      name: Build and push for master
+      if: github.ref == 'refs/heads/master'
+      id: docker_build_master
+      uses: docker/build-push-action@v2
+      with:
+        push: true
+        tags: evennia/evennia:latest
+    -
+      name: Build and push for develop
+      if: github.ref == 'refs/heads/develop'
+      id: docker_build_develop
+      uses: docker/build-push-action@v2
+      with:
+        push: true
+        tags: evennia/evennia:develop