diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 390f61e2d..67f59b3c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build and push Docker images
-        run: ws docker image push $GITHUB_SHA
+        run: |
+          ws docker image build $GITHUB_SHA
+          ws docker image push $GITHUB_SHA
         env:
           DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
           DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
diff --git a/workspace.yml b/workspace.yml
index 6095a2442..9fe3076b7 100644
--- a/workspace.yml
+++ b/workspace.yml
@@ -41,8 +41,6 @@ command('docker image push <git_commit>'):
     #!bash(workspace:/)|@
     echo '@("docker.registry.password")' | run docker login --username='@("docker.registry.username")' --password-stdin '@("docker.registry.url")'
 
-    ws docker image build $GIT_COMMIT_SHA
-
     run docker push @('docker.repository'):${GIT_COMMIT_SHA}
     run docker push @('docker.repository'):latest