diff --git a/kubernetes/25-rabbitmq.yml b/kubernetes/25-rabbitmq.yml
new file mode 100644
index 0000000..d1ad1ec
--- /dev/null
+++ b/kubernetes/25-rabbitmq.yml
@@ -0,0 +1,42 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: amqp
+  labels:
+    app: amqp
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: amqp
+  template:
+    metadata:
+      labels:
+        app: amqp
+    spec:
+      containers:
+      - name: amqp
+        image: rabbitmq:3.6-management
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 5672
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "500m"
+          limits:
+            memory: "1024Mi"
+            cpu: "500m"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: amqp
+spec:
+  type: ClusterIP
+  selector:
+    app: amqp
+  ports:
+    - port: 5672
+      targetPort: 5672
diff --git a/skaffold.yaml b/skaffold.yaml
index 51c4507..a348467 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,36 +1,37 @@
 apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: swh-environment
 build:
   artifacts:
   - image: swh/stack-base
     docker:
       dockerfile: Dockerfile
   - image: swh/objstorage
     docker:
       dockerfile: Dockerfile.objstorage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/storage
     docker:
       dockerfile: Dockerfile.storage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/scheduler
     docker:
       dockerfile: Dockerfile.scheduler
     requires:
       - image: swh/stack-base
         alias: BASE
 deploy:
   kubectl:
     manifests:
     - kubernetes/01-journal.yml
     - kubernetes/05-storage-db.yml
     - kubernetes/10-objstorage.yml
     - kubernetes/11-storage.yml
     - kubernetes/15-scheduler-db.yml
     - kubernetes/20-scheduler.yml
+    - kubernetes/25-rabbitmq.yml