diff --git a/.github/workflows/impress-frontend.yml b/.github/workflows/impress-frontend.yml
index b3eff3f9..3e57af1b 100644
--- a/.github/workflows/impress-frontend.yml
+++ b/.github/workflows/impress-frontend.yml
@@ -86,7 +86,7 @@ jobs:
         run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright chromium
 
       - name: Start Docker services
-        run: make bootstrap-e2e FLUSH_ARGS='--no-input' cache=
+        run: make bootstrap-e2e FLUSH_ARGS='--no-input'
 
       - name: Run e2e tests
         run: cd src/frontend/ && yarn e2e:test --project='chromium'
@@ -125,7 +125,7 @@ jobs:
         run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright firefox webkit chromium
 
       - name: Start Docker services
-        run: make bootstrap-e2e FLUSH_ARGS='--no-input' cache=
+        run: make bootstrap-e2e FLUSH_ARGS='--no-input'
 
       - name: Run e2e tests
         run: cd src/frontend/ && yarn e2e:test --project=firefox --project=webkit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac0055d9..9fc0b58f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to
 ### Changed
 
 - 🧑‍💻(docker): add .next to .dockerignore #1055
+- 🧑‍💻(docker) handle frontend development images with docker compose #1033
 
 ### Fixed
 
diff --git a/Makefile b/Makefile
index 4c0b8c21..36f66e44 100644
--- a/Makefile
+++ b/Makefile
@@ -75,39 +75,39 @@ create-env-files: \
 	env.d/development/kc_postgresql
 .PHONY: create-env-files
 
-base-bootstrap:
-base-bootstrap: \
+pre-bootstrap: \
 	data/media \
 	data/static \
 	create-env-files
-.PHONY: base-bootstrap
+.PHONY: pre-bootstrap
 
-bootstrap: ## Prepare Docker images for the project
-bootstrap: \
-	base-bootstrap \
-	build \
+post-bootstrap: \
 	migrate \
 	demo \
 	back-i18n-compile \
 	mails-install \
-	mails-build \
+	mails-build
+.PHONY: post-bootstrap
+
+
+bootstrap: ## Prepare Docker developmentimages for the project
+bootstrap: \
+	pre-bootstrap \
+	build \
+	post-bootstrap \
 	run
 .PHONY: bootstrap
 
 bootstrap-e2e: ## Prepare Docker production images to be used for e2e tests
 bootstrap-e2e: \
-	base-bootstrap \
+	pre-bootstrap \
 	build-e2e \
-	migrate \
-	demo \
-	back-i18n-compile \
-	mails-install \
-	mails-build \
+	post-bootstrap \
 	run-e2e
 .PHONY: bootstrap-e2e
 
 # -- Docker/compose
-build: cache ?= --no-cache
+build: cache ?=
 build: ## build the project containers
 	@$(MAKE) build-backend cache=$(cache)
 	@$(MAKE) build-yjs-provider cache=$(cache)
@@ -129,10 +129,11 @@ build-frontend: ## build the frontend container
 	@$(COMPOSE) build frontend-development $(cache)
 .PHONY: build-frontend
 
+build-e2e: cache ?=
 build-e2e: ## build the e2e container
-	@$(MAKE) build-backend
-	@$(COMPOSE_E2E) build frontend
-	@$(COMPOSE_E2E) build y-provider
+	@$(MAKE) build-backend cache=$(cache)
+	@$(COMPOSE_E2E) build frontend $(cache)
+	@$(COMPOSE_E2E) build y-provider $(cache)
 .PHONY: build-e2e
 
 down: ## stop and remove containers, networks, images, and volumes