diff --git a/experimental/docker-compose/docker-compose.dev.yml b/experimental/docker-compose/docker-compose.dev.yml
index a57bb68..19ade8c 100644
--- a/experimental/docker-compose/docker-compose.dev.yml
+++ b/experimental/docker-compose/docker-compose.dev.yml
@@ -12,6 +12,8 @@ orca:
   build: ../../../build/orca
 rosco: 
   build: ../../../build/rosco
+fiat:
+  build: ../../../build/fiat
 # comment out services that you don't want rebuilt like this
 # deck: 
 # build: ../../../build/deck
diff --git a/experimental/docker-compose/docker-compose.override.yml b/experimental/docker-compose/docker-compose.override.yml
index c20a7ec..4f70adb 100644
--- a/experimental/docker-compose/docker-compose.override.yml
+++ b/experimental/docker-compose/docker-compose.override.yml
@@ -24,3 +24,6 @@ orca:
 rosco: 
   volumes: 
     - "../../config:/opt/spinnaker/config"
+fiat:
+  volumes:
+    - "../../config:/opt/spinnaker/config"
diff --git a/experimental/docker-compose/docker-compose.remote.yml b/experimental/docker-compose/docker-compose.remote.yml
index a961962..da3e634 100644
--- a/experimental/docker-compose/docker-compose.remote.yml
+++ b/experimental/docker-compose/docker-compose.remote.yml
@@ -24,3 +24,6 @@ orca:
 rosco: 
   volumes: 
     - "/root/spinnakerconfig:/opt/spinnaker/config"
+rosco:
+  volumes:
+    - "/root/spinnakerconfig:/opt/spinnaker/fiat"
diff --git a/experimental/docker-compose/docker-compose.yml b/experimental/docker-compose/docker-compose.yml
index 4093a14..48e81d1 100644
--- a/experimental/docker-compose/docker-compose.yml
+++ b/experimental/docker-compose/docker-compose.yml
@@ -18,6 +18,7 @@ deck:
     - DECK_PORT=9000
     - PROTOCOL=http
     - AUTH_ENABLED=false
+    - "AUTH_ENDPOINT=http://$DOCKER_IP:8084/auth/user"
   image: quay.io/spinnaker/deck
   ports: 
     - "9000:9000"
@@ -102,3 +103,16 @@ rosco:
     - redis
   ports: 
     - "8087:8087"
+fiat:
+  container_name: fiat
+  env_file: ./compose.env
+  environment:
+    - SERVICES_CLOUDDRIVER_HOST=clouddriver
+    - SERVICES_FRONT50_HOST=front50
+  image: quay.io/spinnaker/fiat
+  links:
+    - redis
+    - clouddriver
+    - front50
+  ports:
+    - "7003:7003"