diff --git a/Dockerfile b/Dockerfile
index 21605e14..68b704b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-ARG CKAN_VERSION=2.10
-FROM openknowledge/ckan-dev:${CKAN_VERSION}
+ARG CKAN_VERSION=2.11
+FROM ckan/ckan-dev:${CKAN_VERSION}
 
-RUN apk add tzdata
+USER root
 
 COPY . $APP_DIR/
 
diff --git a/Makefile b/Makefile
index 7ea0a97f..403b5542 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
-CKAN_VERSION ?= 2.10
+CKAN_VERSION ?= 2.11
 COMPOSE_FILE ?= docker-compose.yml
 
 build: ## Build the docker containers
 	CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) build
 
 lint: ## Lint the code
-	SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f docker-compose.yml run --rm app flake8 ckanext --count --show-source --statistics --exclude ckan
+	SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f docker-compose.yml run --rm app flake8 ckanext --count --show-source --statistics --exclude ckan
 
 clean: ## Clean workspace and containers
 	find . -name *.pyc -delete
-	SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) down -v
+	SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) down -v
 
 test: ## Run tests in a new container
-	SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm app ./test.sh
+	SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm app ./test.sh
 
 up: ## Start the containers
-	SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) up app
+	SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) up app
 
 
 .DEFAULT_GOAL := help