diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f381ddc..13a1b1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,6 @@ jobs:
       runs-on: ubuntu-latest
       name: "Build Netflix unlock images"
       env:
-        DOCKER_BUILDKIT: 1
-        DOCKER_CLI_EXPERIMENTAL: enabled
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         DOCKERHUB_REPOSITORY: ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}:latest
@@ -24,15 +22,15 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v1.14.1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${DOCKER_USERNAME}
+          password: ${DOCKER_PASSWORD}
 
       - name: Build and push images to Docker hub
         uses: docker/build-push-action@v2.9.0
         with:
           push: true
-          platforms: linux/amd64,linux/arm64
-          tags: fscarmen/test
+          platforms: linux/amd64,linux/arm64,linux/s390x
+          tags: ${DOCKERHUB_REPOSITORY}
       
       - name: Test container
         run:  |