diff --git a/.env.sample b/.env.sample
index 04862b82..637d0302 100644
--- a/.env.sample
+++ b/.env.sample
@@ -44,7 +44,8 @@ GEODATABASE_URL=postgis://{{project_name}}_data:{geodbpwd}@db:5432/{{project_nam
 GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
-BROKER_URL=amqp://guest:guest@rabbitmq:5672/
+BROKER_URL=redis://redis:6379/0
+CELERY_RESULT_BACKEND=redis://redis:6379/1
 CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=True
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 08323304..435c9bea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -169,12 +169,12 @@ services:
     #ports:
     #  - "5432:5432"
 
-  # Vanilla RabbitMQ service. This is needed by celery
-  rabbitmq:
-    image: rabbitmq:3-alpine
-    container_name: rabbitmq4${COMPOSE_PROJECT_NAME}
+  # Vanilla Redis service. This is needed by celery
+  redis:
+    image: redis:7-alpine
+    container_name: redis4${COMPOSE_PROJECT_NAME}
     volumes:
-      - rabbitmq:/var/lib/rabbitmq
+      - redisdata:/data
     restart: unless-stopped
 
 volumes:
@@ -196,5 +196,5 @@ volumes:
     name: ${COMPOSE_PROJECT_NAME}-data
   tmp:
     name: ${COMPOSE_PROJECT_NAME}-tmp
-  rabbitmq:
-    name: ${COMPOSE_PROJECT_NAME}-rabbitmq
+  redisdata:
+    name: ${COMPOSE_PROJECT_NAME}-redisdata