diff --git a/.env b/.env
index be55479d7..53b41b4e2 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-ARCHIVAL_SCHEDULING_CONNECTION_STRING=localhost
+ARCHIVAL_REDIS_CONNECTION_STRING=redis://redis_db:6379
 ARCHIVAL_GIT_REPOSITORY_DIRECTORY=archives
 ARCHIVAL_GIT_USER_NAME=FilterLists Archival
 ARCHIVAL_GIT_USER_EMAIL=noreply@filterlists.com
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 33cf7480d..b11e8972c 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -10,6 +10,13 @@ services:
       - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
+  archival-api:
+    build:
+      context: ./services
+      dockerfile: archival/src/FilterLists.Archival.Api/Dockerfile.dev
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+
   directory-api:
     build:
       context: ./services
diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml
index a33e66ca2..ab0e20a2b 100644
--- a/docker-compose.prod.build.yml
+++ b/docker-compose.prod.build.yml
@@ -4,6 +4,11 @@
 version: "3.7"
 
 services:
+  archival-api:
+    build:
+      context: ./services
+      dockerfile: archival/src/FilterLists.Archival.Api/Dockerfile
+
   directory-api:
     build:
       context: ./services
diff --git a/docker-compose.yml b/docker-compose.yml
index 1ae9c55d5..95c1f0218 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,26 @@ services:
     volumes:
       - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
 
+  archival-api:
+    image: ghcr.io/collinbarrett/filterlists-archival-api
+    restart: always
+    networks:
+      - archival
+    depends_on:
+      - archival-scheduling-db
+      - directory-api
+    environment:
+      ConnectionStrings__SchedulingConnection: ${ARCHIVAL_REDIS_CONNECTION_STRING}
+
+  archival-scheduling-db:
+    image: redis:alpine
+    restart: always
+    networks:
+      - archival
+    volumes:
+      - archival-scheduling-db:/data
+    entrypoint: ["redis-server", "--appendonly", "yes"]
+
   directory-api:
     image: ghcr.io/collinbarrett/filterlists-directory-api
     restart: always
@@ -36,7 +56,9 @@ services:
 
 networks:
   reverse-proxy:
+  archival:
   directory:
 
 volumes:
+  archival-scheduling-db:
   directory-db: