diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index b8ee1a28..f9a83400 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -53,58 +53,63 @@ jobs:
           # backend
           - image: backend
             file: ./Dockerfile.backend
-            tag: phact/openrag-backend
+            tag: langflowai/openrag-backend
             platform: linux/amd64
             arch: amd64
             runs-on: ubuntu-latest-16-cores
           - image: backend
             file: ./Dockerfile.backend
-            tag: phact/openrag-backend
+            tag: langflowai/openrag-backend
             platform: linux/arm64
             arch: arm64
-            runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            runs-on: RagRunner
 
           # frontend
           - image: frontend
             file: ./Dockerfile.frontend
-            tag: phact/openrag-frontend
+            tag: langflowai/openrag-frontend
             platform: linux/amd64
             arch: amd64
             runs-on: ubuntu-latest-16-cores
           - image: frontend
             file: ./Dockerfile.frontend
-            tag: phact/openrag-frontend
+            tag: langflowai/openrag-frontend
             platform: linux/arm64
             arch: arm64
-            runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            runs-on: RagRunner
 
           # langflow
           - image: langflow
             file: ./Dockerfile.langflow
-            tag: phact/openrag-langflow
+            tag: langflowai/openrag-langflow
             platform: linux/amd64
             arch: amd64
             runs-on: ubuntu-latest-16-cores
           - image: langflow
             file: ./Dockerfile.langflow
-            tag: phact/openrag-langflow
+            tag: langflowai/openrag-langflow
             platform: linux/arm64
             arch: arm64
-            runs-on: self-hosted
+            #runs-on: self-hosted
+            runs-on: RagRunner
 
           # opensearch
           - image: opensearch
             file: ./Dockerfile
-            tag: phact/openrag-opensearch
+            tag: langflowai/openrag-opensearch
             platform: linux/amd64
             arch: amd64
             runs-on: ubuntu-latest-16-cores
           - image: opensearch
             file: ./Dockerfile
-            tag: phact/openrag-opensearch
+            tag: langflowai/openrag-opensearch
             platform: linux/arm64
             arch: arm64
-            runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
+            #runs-on: self-hosted
+            runs-on: RagRunner
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -165,40 +170,40 @@ jobs:
           VERSION=${{ steps.version.outputs.version }}
 
           # Create versioned tags
-          docker buildx imagetools create -t phact/openrag-backend:$VERSION \
-            phact/openrag-backend:$VERSION-amd64 \
-            phact/openrag-backend:$VERSION-arm64
+          docker buildx imagetools create -t langflowai/openrag-backend:$VERSION \
+            langflowai/openrag-backend:$VERSION-amd64 \
+            langflowai/openrag-backend:$VERSION-arm64
 
-          docker buildx imagetools create -t phact/openrag-frontend:$VERSION \
-            phact/openrag-frontend:$VERSION-amd64 \
-            phact/openrag-frontend:$VERSION-arm64
+          docker buildx imagetools create -t langflowai/openrag-frontend:$VERSION \
+            langflowai/openrag-frontend:$VERSION-amd64 \
+            langflowai/openrag-frontend:$VERSION-arm64
 
-          docker buildx imagetools create -t phact/openrag-langflow:$VERSION \
-            phact/openrag-langflow:$VERSION-amd64 \
-            phact/openrag-langflow:$VERSION-arm64
+          docker buildx imagetools create -t langflowai/openrag-langflow:$VERSION \
+            langflowai/openrag-langflow:$VERSION-amd64 \
+            langflowai/openrag-langflow:$VERSION-arm64
 
-          docker buildx imagetools create -t phact/openrag-opensearch:$VERSION \
-            phact/openrag-opensearch:$VERSION-amd64 \
-            phact/openrag-opensearch:$VERSION-arm64
+          docker buildx imagetools create -t langflowai/openrag-opensearch:$VERSION \
+            langflowai/openrag-opensearch:$VERSION-amd64 \
+            langflowai/openrag-opensearch:$VERSION-arm64
 
           # Only update latest tags if version is numeric
           if [[ "$VERSION" =~ ^[0-9.-]+$ ]]; then
             echo "Updating latest tags for production release: $VERSION"
-            docker buildx imagetools create -t phact/openrag-backend:latest \
-              phact/openrag-backend:$VERSION-amd64 \
-              phact/openrag-backend:$VERSION-arm64
+            docker buildx imagetools create -t langflowai/openrag-backend:latest \
+              langflowai/openrag-backend:$VERSION-amd64 \
+              langflowai/openrag-backend:$VERSION-arm64
 
-            docker buildx imagetools create -t phact/openrag-frontend:latest \
-              phact/openrag-frontend:$VERSION-amd64 \
-              phact/openrag-frontend:$VERSION-arm64
+            docker buildx imagetools create -t langflowai/openrag-frontend:latest \
+              langflowai/openrag-frontend:$VERSION-amd64 \
+              langflowai/openrag-frontend:$VERSION-arm64
 
-            docker buildx imagetools create -t phact/openrag-langflow:latest \
-              phact/openrag-langflow:$VERSION-amd64 \
-              phact/openrag-langflow:$VERSION-arm64
+            docker buildx imagetools create -t langflowai/openrag-langflow:latest \
+              langflowai/openrag-langflow:$VERSION-amd64 \
+              langflowai/openrag-langflow:$VERSION-arm64
 
-            docker buildx imagetools create -t phact/openrag-opensearch:latest \
-              phact/openrag-opensearch:$VERSION-amd64 \
-              phact/openrag-opensearch:$VERSION-arm64
+            docker buildx imagetools create -t langflowai/openrag-opensearch:latest \
+              langflowai/openrag-opensearch:$VERSION-amd64 \
+              langflowai/openrag-opensearch:$VERSION-arm64
           else
             echo "Skipping latest tags - version: $VERSION (not numeric)"
           fi
diff --git a/Makefile b/Makefile
index f47bba28..b5804f77 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ test-ci:
 	echo "Pulling latest images..."; \
 	docker compose -f docker-compose-cpu.yml pull; \
 	echo "Building OpenSearch image override..."; \
-	docker build --no-cache -t phact/openrag-opensearch:latest -f Dockerfile .; \
+	docker build --no-cache -t langflowai/openrag-opensearch:latest -f Dockerfile .; \
 	echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \
 	docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \
 	echo "Starting docling-serve..."; \
@@ -288,10 +288,10 @@ test-ci-local:
 	echo "Cleaning up old containers and volumes..."; \
 	docker compose -f docker-compose-cpu.yml down -v 2>/dev/null || true; \
 	echo "Building all images locally..."; \
-	docker build -t phact/openrag-opensearch:latest -f Dockerfile .; \
-	docker build -t phact/openrag-backend:latest -f Dockerfile.backend .; \
-	docker build -t phact/openrag-frontend:latest -f Dockerfile.frontend .; \
-	docker build -t phact/openrag-langflow:latest -f Dockerfile.langflow .; \
+	docker build -t langflowai/openrag-opensearch:latest -f Dockerfile .; \
+	docker build -t langflowai/openrag-backend:latest -f Dockerfile.backend .; \
+	docker build -t langflowai/openrag-frontend:latest -f Dockerfile.frontend .; \
+	docker build -t langflowai/openrag-langflow:latest -f Dockerfile.langflow .; \
 	echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \
 	docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \
 	echo "Starting docling-serve..."; \
diff --git a/docker-compose-cpu.yml b/docker-compose-cpu.yml
index 50e118b7..c5cd15f3 100644
--- a/docker-compose-cpu.yml
+++ b/docker-compose-cpu.yml
@@ -1,6 +1,6 @@
 services:
   opensearch:
-    image: phact/openrag-opensearch:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-opensearch:${OPENRAG_VERSION:-latest}
     #build:
     #  context: .
     #  dockerfile: Dockerfile
@@ -44,7 +44,7 @@ services:
       - "5601:5601"
 
   openrag-backend:
-    image: phact/openrag-backend:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-backend:${OPENRAG_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.backend
@@ -86,7 +86,7 @@ services:
       - ./flows:/app/flows:U,z
 
   openrag-frontend:
-    image: phact/openrag-frontend:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-frontend:${OPENRAG_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.frontend
@@ -101,7 +101,7 @@ services:
   langflow:
     volumes:
       - ./flows:/app/flows:U,z
-    image: phact/openrag-langflow:${LANGFLOW_VERSION:-latest}
+    image: langflowai/openrag-langflow:${LANGFLOW_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.langflow
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ba0cea8..fbba580f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   opensearch:
-    image: phact/openrag-opensearch:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-opensearch:${OPENRAG_VERSION:-latest}
     #build:
     #context: .
     #dockerfile: Dockerfile
@@ -44,7 +44,7 @@ services:
       - "5601:5601"
 
   openrag-backend:
-    image: phact/openrag-backend:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-backend:${OPENRAG_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.backend
@@ -88,7 +88,7 @@ services:
     gpus: all
 
   openrag-frontend:
-    image: phact/openrag-frontend:${OPENRAG_VERSION:-latest}
+    image: langflowai/openrag-frontend:${OPENRAG_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.frontend
@@ -103,7 +103,7 @@ services:
   langflow:
     volumes:
       - ./flows:/app/flows:U,z
-    image: phact/openrag-langflow:${LANGFLOW_VERSION:-latest}
+    image: langflowai/openrag-langflow:${LANGFLOW_VERSION:-latest}
     # build:
     #   context: .
     #   dockerfile: Dockerfile.langflow
diff --git a/pyproject.toml b/pyproject.toml
index 09ce2e9b..334e045e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openrag"
-version = "0.1.38"
+version = "0.1.39-rc3"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"