diff --git a/Procfile.api_only b/Procfile.api_only
deleted file mode 100644
index 2ccffa407..000000000
--- a/Procfile.api_only
+++ /dev/null
@@ -1,5 +0,0 @@
-# Run Rails & Webpack concurrently
-rails:          rails s -e development -p ${API_PORT:-3000} -b 0.0.0.0
-rabbit_workers: bin/rails r lib/rabbit_workers.rb
-worker:         rake jobs:work
-log_digests:    FOREVER=true rake api:log_digest
diff --git a/Procfile.dev b/Procfile.dev
deleted file mode 100644
index 020e5452b..000000000
--- a/Procfile.dev
+++ /dev/null
@@ -1 +0,0 @@
-rails:          rails s -e development -p ${API_PORT:-3000} -b 0.0.0.0
diff --git a/docker-api.Dockerfile b/docker-api.Dockerfile
index 3d99a078d..9b2c2eee6 100644
--- a/docker-api.Dockerfile
+++ b/docker-api.Dockerfile
@@ -1,9 +1,6 @@
 FROM ruby:2.5
-RUN apt-get update -qq && apt-get install -y \
- build-essential \
- libpq-dev \
- postgresql \
- postgresql-contrib
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev \
+  postgresql postgresql-contrib
 RUN     curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN     apt-get install -y nodejs
 RUN     mkdir /farmbot
diff --git a/docker-compose.yml b/docker-compose.yml
index 6dd1274a0..d313000a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       context: .
       dockerfile: docker-api.Dockerfile
     # Add the `rm -f` part to avoid "server is still running..." errors:
-    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -e development -p ${API_PORT:-3000} -b 0.0.0.0"
     volumes:
       - .:/farmbot
       - ./docker_volumes/bundle_cache:/bundle
@@ -47,7 +47,7 @@ services:
     build:
       context: .
       dockerfile: docker-api.Dockerfile
-    command: rake jobs:work
+    command: bundle exec rake jobs:work
     volumes:
       - .:/farmbot
       - ./docker_volumes/bundle_cache:/bundle
@@ -59,7 +59,7 @@ services:
     build:
       context: .
       dockerfile: docker-api.Dockerfile
-    command: rake api:log_digest
+    command: bundle exec rake api:log_digest
     volumes:
       - .:/farmbot
       - ./docker_volumes/bundle_cache:/bundle
@@ -71,7 +71,7 @@ services:
     build:
       context: .
       dockerfile: docker-api.Dockerfile
-    command: rails r lib/rabbit_workers.rb
+    command: bundle exec rails r lib/rabbit_workers.rb
     volumes:
       - .:/farmbot
       - ./docker_volumes/bundle_cache:/bundle