diff --git a/contrib/Dockerfile.ollama b/contrib/Dockerfile.ollama
new file mode 100644
index 0000000..8b583a0
--- /dev/null
+++ b/contrib/Dockerfile.ollama
@@ -0,0 +1,15 @@
+FROM docker.io/ollama/ollama:latest
+
+RUN <<EOF
+# Start Ollama
+nohup ollama serve &
+
+# Wait for Ollama to start
+sleep 15
+
+# Pull model
+ollama pull llama3
+
+# Kill Ollama process
+kill -9 $(ps aux | grep "ollama" | grep -v "grep" | awk '{print $2}')
+EOF
diff --git a/contrib/docker-compose-ollama.yml b/contrib/docker-compose-ollama.yml
index 8c576bc..6506617 100644
--- a/contrib/docker-compose-ollama.yml
+++ b/contrib/docker-compose-ollama.yml
@@ -1,29 +1,8 @@
 ---
-version: '3.8'
-
 services:
   ollama:
-    image: ollama/ollama
+    # image: docker.io/ollama/ollama:latest
+    build:
+      dockerfile: ./Dockerfile.ollama
     ports:
       - 11434:11434
-    # command: >
-    #   echo "Starting Ollama server..."
-    #   ollama serve &
-    #   ollama run llama3
-
-
-    #   echo "Waiting for Ollama server to be active..."
-    #   while [ "$(ollama list | grep 'NAME')" == "" ]; do
-    #     sleep 1
-    #   done
-
-    # command: "ollama pull llama3"
-    # volumes:
-    #   - ./data:/app/data
-    # environment:
-    #   - ENV_VARIABLE=value
-    # healthcheck:
-    #   test: ["CMD", "curl", "-f", "http://localhost:11434/health"]
-    #   interval: 30s
-    #   timeout: 10s
-    #   retries: 3
diff --git a/scripts/devcontainer/post-create.sh b/scripts/devcontainer/post-create.sh
index ebb2717..f0a6161 100644
--- a/scripts/devcontainer/post-create.sh
+++ b/scripts/devcontainer/post-create.sh
@@ -9,9 +9,6 @@ docker compose --file contrib/docker-compose-postgres.yml up --detach
 # Start Ollama Container
 docker compose --file contrib/docker-compose-ollama.yml up --detach
 
-# Start Ollama Model
-docker exec -it contrib-ollama-1 ollama run llama3 &
-
 # Upgrade Pip
 pip install --break-system-package --upgrade pip