diff --git a/Dockerfile b/Dockerfile
index 71ef05444c..fbfad6cdb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,8 +46,8 @@ RUN apt-get update && \
 WORKDIR /usr/src/app
 
 # Keep the .git directory in order to properly report version
-COPY . /usr/src/app
-COPY --from=builder /usr/src/app/dist ./dist/
+COPY . ./
+COPY --from=builder /usr/src/app/dist ./
 COPY --from=builder /usr/src/app/node_modules ./node_modules/
 COPY --from=builder /usr/local/bin/dockerize /usr/local/bin/
 
diff --git a/package.json b/package.json
index d950ebaafb..69b97073ca 100644
--- a/package.json
+++ b/package.json
@@ -2,19 +2,19 @@
   "name": "backbeat",
   "version": "8.4.23",
   "description": "Asynchronous queue and job manager",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
-    "queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node dist/bin/queuePopulator.js",
-    "queue_processor": "node dist/extensions/replication/queueProcessor/task.js",
-    "ingestion_populator": "node dist/bin/ingestion.js",
-    "replication_status_processor": "node dist/extensions/replication/replicationStatusProcessor/task.js",
-    "lifecycle_conductor": "node dist/extensions/lifecycle/conductor/service.js",
-    "lifecycle_bucket_processor": "node dist/extensions/lifecycle/bucketProcessor/task.js",
-    "lifecycle_object_processor": "node dist/extensions/lifecycle/objectProcessor/task.js",
-    "lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node dist/extensions/lifecycle/objectProcessor/task.js",
-    "oplog_populator": "node dist/extensions/oplogPopulator/OplogPopulatorTask.js",
-    "mongo_queue_processor": "node dist/extensions/mongoProcessor/mongoProcessorTask.js",
-    "garbage_collector": "node dist/extensions/gc/service.js",
+    "queue_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=replication,lifecycle node bin/queuePopulator.js",
+    "queue_processor": "node extensions/replication/queueProcessor/task.js",
+    "ingestion_populator": "node bin/ingestion.js",
+    "replication_status_processor": "node extensions/replication/replicationStatusProcessor/task.js",
+    "lifecycle_conductor": "node extensions/lifecycle/conductor/service.js",
+    "lifecycle_bucket_processor": "node extensions/lifecycle/bucketProcessor/task.js",
+    "lifecycle_object_processor": "node extensions/lifecycle/objectProcessor/task.js",
+    "lifecycle_object_transition_processor": "LIFECYCLE_OBJECT_PROCESSOR_TYPE=transition node extensions/lifecycle/objectProcessor/task.js",
+    "oplog_populator": "node extensions/oplogPopulator/OplogPopulatorTask.js",
+    "mongo_queue_processor": "node extensions/mongoProcessor/mongoProcessorTask.js",
+    "garbage_collector": "node extensions/gc/service.js",
     "test": "jest /unit --forceExit",
     "ft_test": "jest /functional --forceExit --testTimeout 30000",
     "ft_test:notification": "jest /functional/notification --forceExit --testTimeout 30000",
@@ -28,9 +28,9 @@
     "bh_test": "jest /behavior",
     "lint": "eslint $(git ls-files '*.js')",
     "lint_md": "mdlint $(git ls-files '[^bucket-scanner/]*.md')",
-    "start": "node dist/bin/backbeat.js",
-    "notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification BACKBEAT_QUEUEPOPULATOR_LOGSOURCE=kafka node dist/bin/queuePopulator.js",
-    "notification_processor": "node dist/extensions/notification/queueProcessor/task.js",
+    "start": "node bin/backbeat.js",
+    "notification_populator": "BACKBEAT_QUEUEPOPULATOR_EXTENSIONS=notification BACKBEAT_QUEUEPOPULATOR_LOGSOURCE=kafka node bin/queuePopulator.js",
+    "notification_processor": "node extensions/notification/queueProcessor/task.js",
     "build": "yarn tsc"
   },
   "repository": {
@@ -84,7 +84,6 @@
   "jest": {
     "maxWorkers": 1,
     "testPathIgnorePatterns": [
-      "/dist/",
       "/node_modules/"
     ],
     "preset": "ts-jest",