diff --git a/infra/docker/Dockerfile b/infra/docker/Dockerfile
new file mode 100644
index 0000000..371f2d4
--- /dev/null
+++ b/infra/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM rabbitmq:3.8-management
+RUN apt-get update && apt-get install -y wget unzip
+RUN wget https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/releases/download/v3.8.0/rabbitmq_delayed_message_exchange-3.8.0.ez
+RUN mv rabbitmq_delayed_message_exchange-3.8.0.ez $RABBITMQ_HOME/plugins/
+RUN rabbitmq-plugins enable --offline rabbitmq_delayed_message_exchange
\ No newline at end of file
diff --git a/infra/docker/docker-compose.yaml b/infra/docker/docker-compose.yaml
index 74c31ab..6ec940f 100644
--- a/infra/docker/docker-compose.yaml
+++ b/infra/docker/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
     expose:
       - 27017
   rabbitmq:
-    image: heidiks/rabbitmq-delayed-message-exchange:latest
+    image: todorabbit:latest
     restart: always
     ports:
       - 5672:5672
@@ -27,11 +27,6 @@ services:
     environment:
       - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
       - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
-    command: |
-      bash -c "
-        rabbitmq-plugins enable rabbitmq_delayed_message_exchange && \
-        rabbitmq-server
-      "
     expose:
       - 5672
       - 15672
diff --git a/request.http b/request.http
index 8940f6e..309c54d 100644
--- a/request.http
+++ b/request.http
@@ -9,7 +9,7 @@ Content-Type: application/json
 {
     "title": "Go to the gymNEW!!!",
     "description": "Go to the gym at 8pm",
-    "due_date": "2023-07-08T15:24:00.000Z"
+    "due_date": "2023-07-08T16:02:00.000Z"
 }
 
 ### update request