diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index 768459ac..c3caed72 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -14,27 +14,11 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_NOLOGO: true
 
-    services:
-      baget:
-        image: loicsharma/baget
-        env:
-          ApiKey: acd0b30512ac4fa39f62eb7a61fcf56c
-        ports:
-        - 5555:80
-
     steps:
     - uses: actions/checkout@v2
       
-    - name: Start Docker registry (delayed, as we need to mount the htpasswd from the checkout)
-      run: |
-        docker run \
-          -d \
-          -v ${{ github.workspace }}/Services/Registry:/auth:rw \
-          -p 5000:5000 \
-          -e "REGISTRY_AUTH=htpasswd" \
-          -e "REGISTRY_AUTH_HTPASSWD_REALM=Bake test registry" \
-          -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" \
-          registry:2
+    - name: Start Docker services
+      run: docker-compose up -d --force-recreate
 
     - name: Setup .NET Core 3.1.x
       uses: actions/setup-dotnet@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8da6c71..db907d44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,27 +14,11 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
 
-    services:
-      baget:
-        image: loicsharma/baget
-        env:
-          ApiKey: acd0b30512ac4fa39f62eb7a61fcf56c
-        ports:
-        - 5555:80
-
     steps:
     - uses: actions/checkout@v2
 
-    - name: Start Docker registry (delayed, as we need to mount the htpasswd from the checkout)
-      run: |
-        docker run \
-          -d \
-          -v ${{ github.workspace }}/Services/Registry:/auth:rw \
-          -p 5000:5000 \
-          -e "REGISTRY_AUTH=htpasswd" \
-          -e "REGISTRY_AUTH_HTPASSWD_REALM=Bake test registry" \
-          -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" \
-          registry:2
+    - name: Start Docker services
+      run: docker-compose up -d --force-recreate
       
     - name: Setup .NET Core 3.1.x
       uses: actions/setup-dotnet@v1