diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml
index c1b1b8d1f..b519205dc 100644
--- a/.github/workflows/basket-api.yml
+++ b/.github/workflows/basket-api.yml
@@ -62,6 +62,15 @@ jobs:
     - name: 'Checkout Github Action'
       uses: actions/checkout@master
 
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
     - name: Login to Container Registry
       uses: docker/login-action@v1
       with:
@@ -94,10 +103,6 @@ jobs:
 
     - name: Create multiarch manifest
       run: |
-        sudo sed '$ s/.$//' ~/.docker/config.json
-        echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-        sudo service docker restart
-        cat ~/.docker/config.json
         docker --config ~/.docker manifest create ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
         docker --config ~/.docker manifest push ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
       shell: bash