diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 661c7b9649..434ca1045b 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         target: [ release, test ]
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest-8-cores
     env:
       WORKFLOW_TAG: ${{ github.event.inputs.docker_tag }}
     steps:
@@ -79,7 +79,7 @@ jobs:
           context: .
           file: ./docker/centrifuge-chain/Dockerfile
           build-args: |
-            FEATURES=${{ matrix.target == 'test' && 'fast-runtime' || '' }}
+            FEATURES=${{ matrix.target == 'test' && join(['fast', 'runtime'], '-') || '' }}
           # SCCACHE_GHA_ENABLED="true"
           # RUSTC_WRAPPER=sccache
           push: ${{ github.ref == '/refs/heads/main' && true || false }}
diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
index eaeba5801b..f039396e6c 100644
--- a/.github/workflows/build-wasm.yml
+++ b/.github/workflows/build-wasm.yml
@@ -16,7 +16,7 @@ jobs:
     # Benchmark (with cache hit)
     # ubuntu-latest 50 min
     # ubuntu-latest-4-cores 34 min
-    runs-on:  ubuntu-latest-8-cores
+    runs-on:  ubuntu-latest-4-cores
     strategy:
       matrix:
         # To test until I get one right
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index d6d9233fd8..70ed8f5e07 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: write
       id-token: write
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest-4-cores
     env:
       RUST_TOOLCHAIN: "1.66.0"
       RUSTDOCFLAGS: "-D warnings"
diff --git a/docker/centrifuge-chain/Dockerfile b/docker/centrifuge-chain/Dockerfile
index f4ea94d4af..f07e65235c 100644
--- a/docker/centrifuge-chain/Dockerfile
+++ b/docker/centrifuge-chain/Dockerfile
@@ -41,7 +41,8 @@ FROM --platform=linux/amd64 docker.io/library/ubuntu:22.04 as builder
 	
 	COPY . centrifuge-chain
 	WORKDIR /centrifuge-chain	
-	RUN	cargo build "--release" --features=${FEATURES}
+	RUN	FEATURES=$(echo ${FEATURES} | tr -d '"') \
+		cargo build "--release" --features=${FEATURES}
 
 
 # ===== SECOND STAGE ======
@@ -52,7 +53,7 @@ FROM --platform=linux/amd64 docker.io/library/ubuntu:22.04
 		io.centrifuge.image.vendor="Centrifuge" \
 		io.centrifuge.image.title="centrifugeio/centrifuge-chain" \
 		io.centrifuge.image.description="Centrifuge, the layer 1 of RWA. This is the official Centrifuge image with an injected binary." \
-		io.centrifuge.image.source="https://github.com/centrifuge/centrifuge-chain/blob/main/Dockerfile" \
+		io.centrifuge.image.source="https://github.com/centrifuge/centrifuge-chain/blob/main/docker/centrifuge-chain/Dockerfile" \
 		# io.centrifuge.image.revision="${VCS_REF}" \
 		io.centrifuge.image.created="${BUILD_DATE}"