diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index 7f5fbe5..5040896 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -4,7 +4,7 @@ on: [push]
 env:
   ADDON_NAME: "volto-form-block"
   ADDON_PATH: "volto-form-block"
-  VOLTO_VERSION: "17.0.0"
+  VOLTO_VERSION: "16.30.0"
 
 jobs:
 
diff --git a/Makefile b/Makefile
index 6a72425..5b7ef07 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ build-live: ## Build Addon live
 .PHONY: build-addon
 build-addon: ## Build Addon dev
 	@echo "$(GREEN)==> Build Addon development container $(RESET)"
-	${DEV_COMPOSE} build addon-dev
+	${DEV_COMPOSE} build --no-cache addon-dev
 
 .PHONY: start-dev
 start-dev: ## Starts Dev container
diff --git a/acceptance/ci.yml b/acceptance/ci.yml
index b0c6434..b28830b 100644
--- a/acceptance/ci.yml
+++ b/acceptance/ci.yml
@@ -1,15 +1,14 @@
-version: "3"
+version: '3'
 
 services:
-
   addon-acceptance:
     build:
       context: ../
       dockerfile: ./dockerfiles/Dockerfile
       args:
-        ADDON_NAME: "${ADDON_NAME}"
-        ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: ${VOLTO_VERSION:-17}
+        ADDON_NAME: '${ADDON_NAME}'
+        ADDON_PATH: '${ADDON_PATH}'
+        VOLTO_VERSION: ${VOLTO_VERSION}
     environment:
       RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone
       RAZZLE_API_PATH: http://localhost:55001/plone
diff --git a/acceptance/docker-compose.yml b/acceptance/docker-compose.yml
index 0af8d4a..287bc62 100644
--- a/acceptance/docker-compose.yml
+++ b/acceptance/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       args:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: ${VOLTO_VERSION:-17}
+        VOLTO_VERSION: ${VOLTO_VERSION}
     volumes:
       - ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
     environment:
@@ -32,7 +32,7 @@ services:
       args:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: ${VOLTO_VERSION:-17}
+        VOLTO_VERSION: ${VOLTO_VERSION}
     environment:
       RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone
       RAZZLE_API_PATH: http://localhost:55001/plone
diff --git a/dockerfiles/docker-compose.yml b/dockerfiles/docker-compose.yml
index 6339853..cf2b994 100644
--- a/dockerfiles/docker-compose.yml
+++ b/dockerfiles/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       args:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: "${VOLTO_VERSION:-17}"
+        VOLTO_VERSION: "${VOLTO_VERSION}"
     volumes:
       - ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
     environment:
@@ -35,7 +35,7 @@ services:
       args:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: "${VOLTO_VERSION:-17}"
+        VOLTO_VERSION: "${VOLTO_VERSION}"
     environment:
       RAZZLE_INTERNAL_API_PATH: http://backend:8080/Plone
       RAZZLE_API_PATH: http://localhost:8080/Plone