diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 800a58fb..e331605b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -63,9 +63,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=latest
-          labels: |
-            org.opencontainers.image.description=OptiLLM proxy-only image for API routing without model serving capabilities
-      
+            
       # Build and push proxy image
       - name: Build and push proxy_only Docker image
         uses: docker/build-push-action@v5
@@ -76,8 +74,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta-proxy.outputs.tags }}
           labels: ${{ steps.meta-proxy.outputs.labels }}
-          annotations: |
-            org.opencontainers.image.description=OptiLLM proxy-only image for API routing without model serving capabilities
           cache-from: type=gha,scope=proxy
           cache-to: type=gha,scope=proxy,mode=max
       
@@ -100,8 +96,6 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             latest
-          labels: |
-            org.opencontainers.image.description=OptiLLM full image with model serving and API routing capabilities
               
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
@@ -111,7 +105,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          annotations: |
-            org.opencontainers.image.description=OptiLLM full image with model serving amd API routing capabilities
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index f0021fc2..bbb9d32e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,7 @@
+LABEL org.opencontainers.image.source=https://github.com/codelion/optillm
+LABEL org.opencontainers.image.description="OptiLLM full image with model serving and API routing capabilities"
+LABEL org.opencontainers.image.licenses=Apache-2.0
+
 # Build stage
 FROM python:3.12-slim AS builder
 
diff --git a/Dockerfile.proxy_only b/Dockerfile.proxy_only
index bc4cc90b..e5db1708 100644
--- a/Dockerfile.proxy_only
+++ b/Dockerfile.proxy_only
@@ -1,3 +1,7 @@
+LABEL org.opencontainers.image.source=https://github.com/codelion/optillm
+LABEL org.opencontainers.image.description="OptiLLM proxy-only image for API routing without model serving capabilities"
+LABEL org.opencontainers.image.licenses=Apache-2.0
+
 # Build stage
 FROM python:3.12-slim AS builder
 
diff --git a/setup.py b/setup.py
index 25ffe48b..136dea32 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="optillm",
-    version="0.0.31",
+    version="0.0.32",
     packages=find_packages(),
     py_modules=['optillm'],
     package_data={