diff --git a/Makefile b/Makefile
index 393326111a..400b737ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -453,6 +453,9 @@ dev.shell.analyticsapi:
 dev.shell.insights:
 	docker-compose exec insights env TERM=$(TERM) bash -c 'eval $$(source /edx/app/insights/insights_env; echo PATH="$$PATH";) && /bin/bash'
 
+dev.shell.edx_notes_api:
+	docker-compose exec edx_notes_api env TERM=$(TERM) bash -c 'eval $$(source /edx/app/edx_notes_api/edx_notes_api_env; echo PATH="$$PATH";) && /bin/bash'
+
 dev.shell.%: ## Run a shell on the specified service's container.
 	docker-compose exec $* /bin/bash
 
diff --git a/configuration_files/edx_notes_api.yml b/configuration_files/edx_notes_api.yml
new file mode 100644
index 0000000000..9782f5b4c8
--- /dev/null
+++ b/configuration_files/edx_notes_api.yml
@@ -0,0 +1,36 @@
+---
+
+ALLOWED_HOSTS:
+- localhost
+CLIENT_ID: CHANGEME
+CLIENT_SECRET: CHANGEME
+DATABASES:
+    default:
+        ENGINE: django.db.backends.mysql
+        HOST: db
+        NAME: edx_notes_api
+        OPTIONS:
+            connect_timeout: 10
+        PASSWORD: secret
+        PORT: '3306'
+        USER: notes001
+DISABLE_TOKEN_CHECK: false
+ELASTICSEARCH_INDEX: edx_notes
+ELASTICSEARCH_URL: http://es:9200/
+HAYSTACK_CONNECTIONS:
+    default:
+        ENGINE: notesserver.highlight.ElasticsearchSearchEngine
+        INDEX_NAME: edx_notes_api
+        URL: http://es:9200/
+JWT_AUTH:
+    JWT_AUTH_COOKIE_HEADER_PAYLOAD: edx-jwt-cookie-header-payload
+    JWT_AUTH_COOKIE_SIGNATURE: edx-jwt-cookie-signature
+    JWT_ISSUERS:
+    -   AUDIENCE: SET-ME-PLEASE
+        ISSUER: http://127.0.0.1:8000/oauth2
+        SECRET_KEY: SET-ME-PLEASE
+    JWT_PUBLIC_SIGNING_JWK_SET: ''
+RESULTS_DEFAULT_SIZE: 25
+RESULTS_MAX_SIZE: 250
+SECRET_KEY: CHANGEME
+USERNAME_REPLACEMENT_WORKER: OVERRIDE THIS WITH A VALID USERNAME
diff --git a/docker-compose.yml b/docker-compose.yml
index 17cf81fe68..0646c14308 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -389,7 +389,8 @@ services:
       - elasticsearch710
       - lms
       - mysql57
-    image: edxops/notes:${OPENEDX_RELEASE:-latest}
+    image: edxops/notes-dev:${OPENEDX_RELEASE:-latest}
+    working_dir: /edx/app/edx_notes_api/edx_notes_api
     networks:
       default:
         aliases:
@@ -407,6 +408,8 @@ services:
       ENABLE_DJANGO_TOOLBAR: 1
       ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch710:9200"
       ELASTICSEARCH_DSL: "http://edx.devstack.elasticsearch710:9200"
+    volumes:
+      - ${PWD}/configuration_files/edx_notes_api.yml:/edx/etc/edx_notes_api.yml
 
   forum:
     command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 2; done'