diff --git a/docker/api/Dockerfile.dev b/docker/api/Dockerfile.dev
new file mode 100644
index 00000000..fc735a31
--- /dev/null
+++ b/docker/api/Dockerfile.dev
@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0
+
+ENV ASPNETCORE_ENVIRONMENT='Production'
+ENV ASPNETCORE_URLS='http://+:5000'
+ENV CORS_DOMAIN='http://localhost:8080'
+ENV DOTNET_STARTUP_PROJECT='./api/api.csproj'
+ENV DOTNET_USE_POLLING_FILE_WATCHER 1
+
+RUN    curl -sSL https://aka.ms/getvsdbgsh | /bin/sh /dev/stdin -v latest -l /vsdbg
\ No newline at end of file
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 12488e4b..36933d41 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -53,6 +53,11 @@ services:
     ports:
       - 5000:5000
     volumes:
+      - ../api/:/opt/app-root/src/api
+      - ../db/:/opt/app-root/src/db
+      - ../jc-interface-client/:/opt/app-root/src/jc-interface-client
+      - scv-api-dev-bin:/opt/app-root/src/api/bin
+      - scv-api-dev-obj:/opt/app-root/src/api/obj
       - ./seed:/opt/app-root/data
     depends_on:
       - db
@@ -60,7 +65,7 @@ services:
       /bin/bash -c "
         echo Waiting for the database service to start up ...;
         sleep 10;
-        /usr/libexec/s2i/run;"
+        dotnet watch run --project /opt/app-root/src/api/api.csproj --urls='http://+:5000';"
 
   db:
     image: centos/postgresql-12-centos8
@@ -72,4 +77,8 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - ./tmp:/tmp2
\ No newline at end of file
+      - ./tmp:/tmp2
+
+volumes:
+  scv-api-dev-bin:
+  scv-api-dev-obj:
\ No newline at end of file
diff --git a/docker/manage b/docker/manage
index d8e2993f..1676c04a 100755
--- a/docker/manage
+++ b/docker/manage
@@ -66,17 +66,12 @@ build-api() {
   # api
   #
   echo -e "\n\n===================================================================================================="
-  echo -e "Building api image using s2i ..."
+  echo -e "Building api image using docker ..."
   echo -e "----------------------------------------------------------------------------------------------------"
-  ${S2I_EXE} build \
-    --copy \
-    -e "ASPNETCORE_ENVIRONMENT=Production" \
-    -e "ASPNETCORE_URLS=http://+:5000" \
-    -e "CORS_DOMAIN=http://localhost:8080" \
-    -e "DOTNET_STARTUP_PROJECT=./api/api.csproj" \
-    '..' \
-    'registry.access.redhat.com/ubi8/dotnet-80:8.0' \
-    'scv-api'
+  docker build \
+    -t 'scv-api' \
+    -f './api//Dockerfile.dev' '..'
+
   echo -e "===================================================================================================="
 }