diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index faabb159a0..decce38e3d 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -19,6 +19,7 @@ x-common-ui-variables: &common-ui-variables
     REALTIME_ROUTE: ${REALTIME_ROUTE}
     NOTIFICATION_ROUTE: ${NOTIFICATION_ROUTE}
     DASHBOARD_ROUTE: ${DASHBOARD_ROUTE}
+    ADMIN_DASHBOARD_ROUTE: ${ADMIN_DASHBOARD_ROUTE}
     DASHBOARD_API_ROUTE: ${DASHBOARD_API_ROUTE}
     PROBE_API_ROUTE: ${PROBE_API_ROUTE}
     DATA_INGESTOR_ROUTE: ${DATA_INGESTOR_ROUTE}
@@ -61,6 +62,7 @@ x-common-server-variables: &common-server-variables
     REALTIME_HOSTNAME: ${REALTIME_HOSTNAME}
     NOTIFICATION_HOSTNAME: ${NOTIFICATION_HOSTNAME}
     DASHBOARD_HOSTNAME: ${DASHBOARD_HOSTNAME}
+    ADMIN_DASHBOARD_HOSTNAME: ${ADMIN_DASHBOARD_HOSTNAME}
     DASHBOARD_API_HOSTNAME: ${DASHBOARD_API_HOSTNAME}
     PROBE_API_HOSTNAME: ${DATA_INGESTOR_HOSTNAME}
     DATA_INGESTOR_HOSTNAME: ${DATA_INGESTOR_HOSTNAME}
@@ -76,6 +78,7 @@ x-common-server-variables: &common-server-variables
     REALTIME_ROUTE: ${REALTIME_ROUTE}
     NOTIFICATION_ROUTE: ${NOTIFICATION_ROUTE}
     DASHBOARD_ROUTE: ${DASHBOARD_ROUTE}
+    ADMIN_DASHBOARD_ROUTE: ${ADMIN_DASHBOARD_ROUTE}
     DASHBOARD_API_ROUTE: ${DASHBOARD_API_ROUTE}
     PROBE_API_ROUTE: ${PROBE_API_ROUTE}
     DATA_INGESTOR_ROUTE: ${DATA_INGESTOR_ROUTE}
@@ -202,6 +205,17 @@ services:
             - identity
        
 
+    admin-dashboard:
+        networks:
+          - oneuptime
+        restart: always
+        environment:
+            <<: *common-ui-variables
+            PORT: ${ADMIN_DASHBOARD_PORT}
+        depends_on:
+            - identity
+            - accounts
+
     dashboard:
         networks:
           - oneuptime
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 8c9c28dd78..89bae69dcc 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -118,6 +118,32 @@ services:
         
     
 
+    admin-dashboard:
+        ports: 
+            - '${ADMIN_DASHBOARD_PORT}:${ADMIN_DASHBOARD_PORT}' # ws port for webpack
+        extends:
+            file: ./docker-compose.base.yml
+            service: admin-dashboard
+        volumes:
+            - ./AdminDashboard:/usr/src/app
+            # Use node modules of the container and not host system.
+            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
+            - /usr/src/app/dev-env
+            - /usr/src/app/node_modules/
+            - ./Common:/usr/src/Common
+            - ./Model:/usr/src/Model
+            - ./CommonServer:/usr/src/CommonServer
+            - ./CommonUI:/usr/src/CommonUI
+            - /usr/src/Common/node_modules/
+            - /usr/src/CommonUI/node_modules/
+            - /usr/src/CommonServer/node_modules/
+            - /usr/src/Model/node_modules/
+        build:
+            network: host
+            context: .
+            dockerfile: ./AdminDashboard/Dockerfile
+
+
     status-page:
         ports: 
             - '${STATUS_PAGE_PORT}:${STATUS_PAGE_PORT}' # ws port for webpack
diff --git a/docker-compose.yml b/docker-compose.yml
index 02ec708eb6..94ca873297 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,11 @@ services:
             file: ./docker-compose.base.yml
             service: dashboard
         
-    
+    admin-dashboard:
+        image:  oneuptime/admin-dashboard:${APP_TAG}
+        extends:
+            file: ./docker-compose.base.yml
+            service: admin-dashboard
 
     status-page:
         image:  oneuptime/status-page:${APP_TAG}