diff --git a/CODEOWNERS b/CODEOWNERS
index 91a0767e..137f4042 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @lockwobr @mskalka @ayuskauskas
\ No newline at end of file
+* @lockwobr @mskalka @ayuskauskas @riceriley59
\ No newline at end of file
diff --git a/docs/release-process.md b/docs/release-process.md
index 042ef201..d551d13c 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -1,55 +1,111 @@
 # Skyhook Release Process
 
-Step-by-step process for releasing Skyhook components (operator, agent, chart).
+Step-by-step process for releasing Skyhook components using **release branches**.
 
-## Release Workflow
+## Release Branch Strategy
 
-### Operator Release
+Skyhook uses **release branches** (`release/v{MAJOR.MINOR}.x`) to manage integrated releases and patches.
+
+**Key Principles:**
+- **Operator-centric**: Most releases are driven by operator features and bug fixes
+- **Agent follows**: Agent changes typically only require chart patch releases 
+- **Chart coordinates**: Chart version tracks the overall release and defines compatibility
+
+### Major/Minor Release Workflow
 
 ```bash
-# 1. Test thoroughly, merge all PRs to main
-# 2. Tag and push
+# 1. Complete development on main
 git checkout main && git pull origin main
-git tag operator/v1.2.3
-git push origin operator/v1.2.3
+# Ensure all features/fixes are merged and tested
+
+# 2. Create release branch
+git checkout -b release/v0.9.x
+git push origin release/v0.9.x
+
+# 3. Update chart with final versions
+# Edit chart/Chart.yaml:
+version: v0.9.0        # Chart version
+appVersion: v0.9.0     # Recommended operator version
+
+git add chart/Chart.yaml
+git commit -m "release: prepare v0.9.0"
+git push origin release/v0.9.x
+
+# 4. Tag all components that changed  
+git tag operator/v0.9.0    # Operator drives the release
+git tag agent/v6.4.0       # Only if agent changed (often reuses previous version)
+git tag chart/v0.9.0       # Chart always gets tagged
+git push origin operator/v0.9.0 chart/v0.9.0  # Push operator + chart (add agent tag if needed)
 ```
 
-**Automated:** Tests → Multi-platform build → Publish to ghcr.io + nvcr.io → Attestations
+**Automated:** Tests → Multi-platform build → Publish to ghcr.io + nvcr.io + NGC
 
-### Agent Release
+### Patch Release Workflow
 
 ```bash
-# 1. Test agent compatibility, merge all PRs to main  
-# 2. Tag and push
-git checkout main && git pull origin main
-git tag agent/v1.2.3
-git push origin agent/v1.2.3
+# 1. Work on release branch
+git checkout release/v0.9.x
+git pull origin release/v0.9.x
+
+# 2. Apply fixes (backport from main or develop directly)
+# ... make changes to operator, agent, or chart
+git add .
+git commit -m "fix: critical security issue"
+
+# 3. Update chart version if needed
+# Edit chart/Chart.yaml:
+version: v0.9.1        # Increment patch version
+appVersion: v0.9.1     # Update if operator changed
+
+# 4. Tag only what changed
+git tag operator/v0.9.1    # If operator changed
+git tag agent/v6.4.1       # Only if agent changed (rare)
+git tag chart/v0.9.1       # Chart always gets tagged for releases
+git push origin operator/v0.9.1 chart/v0.9.1  # Usually just operator + chart
+```
+
+### Agent-Only Changes
+
+```bash
+# Agent changes typically don't require new release branches
+git checkout release/v0.9.x  # Work on existing release branch
+# ... fix agent issue
+git tag agent/v6.4.1         # New agent version
+git tag chart/v0.9.1         # Patch chart to reference new agent
+git push origin agent/v6.4.1 chart/v0.9.1
 ```
 
-**Automated:** Tests → Multi-platform build → Publish to ghcr.io + nvcr.io
+### Legacy: Individual Component Releases (Deprecated)
 
-### Chart Release
+*The following workflows are deprecated in favor of the release branch strategy above.*
 
+<details>
+<summary>Click to expand legacy workflows</summary>
+
+#### Operator Release (Legacy)
 ```bash
-# 1. Update Chart.yaml versions
-# chart/Chart.yaml
-version: v1.2.3        # Chart version
-appVersion: v0.8.0     # Recommended operator version
+git checkout main && git pull origin main
+git tag operator/v1.2.3
+git push origin operator/v1.2.3
+```
 
-# 2. Create PR and merge
-git checkout -b release/chart-v1.2.3
-git add chart/Chart.yaml
-git commit -m "chart: bump version to v1.2.3"
-git push origin release/chart-v1.2.3
-# Review and merge PR
+#### Agent Release (Legacy)
+```bash
+git checkout main && git pull origin main
+git tag agent/v1.2.3
+git push origin agent/v1.2.3
+```
 
-# 3. Tag after merge
+#### Chart Release (Legacy)
+```bash
+git checkout -b release/chart-v1.2.3
+# Update Chart.yaml, create PR, merge
 git checkout main && git pull origin main
 git tag chart/v1.2.3
 git push origin chart/v1.2.3
 ```
 
-**Automated:** Package Helm chart → Publish to chart repository (when implemented)
+</details>
 
 ## Release Checklist
 
diff --git a/docs/versioning.md b/docs/versioning.md
index c9f5a526..1822b9c0 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -47,6 +47,41 @@ image:
 image: "ghcr.io/nvidia/skyhook/operator:0.7.0"
 ```
 
+## Release Branching Strategy
+
+Skyhook uses **release branches** to manage patches and maintenance releases:
+
+```bash
+release/v0.8.x    # Contains operator v0.8.0 + agent v6.3.0 + chart v0.8.x
+release/v0.9.x    # Contains operator v0.9.0 + (agent v6.3.0*) + chart v0.9.x
+```
+*Agent versions may not change every release - operator drives the release cycle
+
+### Why Release Branches:
+- **Operator-centric releases** - most releases are driven by operator features and bugs
+- **Chart defines compatibility** - each branch contains a tested, compatible set of all components  
+- **Agent follows operator** - agent changes typically only require chart patch releases
+- **Simplified patches** - fix bugs in the context of the full integrated system
+- **Connected git history** - preserves relationships between operator, agent, and chart changes
+
+### Branch Workflow:
+1. **Main development** happens on `main` branch
+2. **Release preparation** creates `release/v{MAJOR.MINOR}.x` branch (typically driven by operator changes)
+3. **Patch releases** are developed and tagged from release branches
+4. **Agent-only changes** usually result in chart patch releases (no new release branch)
+5. **Critical fixes** may be backported from `main` to release branches
+
+## Go Module Support
+
+The operator supports Go module imports for external projects:
+
+```bash
+# External projects can import the operator
+go get github.com/NVIDIA/skyhook/operator@v0.8.0
+```
+
+**Module mapping**: Tag `operator/v0.8.0` maps to module `github.com/NVIDIA/skyhook/operator@v0.8.0`
+
 ## Quick Reference
 
 ```bash
@@ -56,6 +91,9 @@ helm list -n skyhook
 
 # Override operator version
 helm install skyhook ./chart --set controllerManager.manager.image.tag="0.8.0"
+
+# Check release branches
+git branch -r | grep release/
 ```
 
 ## Release Process
diff --git a/operator/Makefile b/operator/Makefile
index 98bd62b4..4b53b0c0 100644
--- a/operator/Makefile
+++ b/operator/Makefile
@@ -40,8 +40,8 @@ GIT_SHA 		:= $(shell git rev-parse --short HEAD)
 GIT_TAG_LAST 	:= $(shell git tag --list 'operator*' --sort=-v:refname | head -n 1 | cut -d/ -f2)
 
 ## GO Flags
-GO_LDFLAGS  := -ldflags "-X github.com/NVIDIA/skyhook/internal/version.GIT_SHA=$(GIT_SHA) \
-	-X github.com/NVIDIA/skyhook/internal/version.VERSION=$(VERSION)"
+GO_LDFLAGS  := -ldflags "-X github.com/NVIDIA/skyhook/operator/internal/version.GIT_SHA=$(GIT_SHA) \
+	-X github.com/NVIDIA/skyhook/operator/internal/version.VERSION=$(VERSION)"
 GOFLAGS 	:= -mod=vendor
 
 # DOCKER_CMD defines the container tool to be used for building images.
@@ -230,7 +230,7 @@ merge-coverage:
 	echo "mode: set" > $(REPORTING)/cover.out
 	## skip first line with +2
 	tail -n +2 $(REPORTING)/temp-cover.out | sed  '/mode: set/d' >> $(REPORTING)/cover.out
-	$(sedrp) 's|^/.*skyhook/operator/(.*)$$|github\.com/NVIDIA/skyhook/\1|g' $(REPORTING)/cover.out
+	$(sedrp) 's|^/.*skyhook/operator/(.*)$$|github\.com/NVIDIA/skyhook/operator/\1|g' $(REPORTING)/cover.out
 
 .PHONY: lint
 lint: golangci-lint license-check ## Run golangci-lint linter & yamllint
diff --git a/operator/api/v1alpha1/skyhook_types.go b/operator/api/v1alpha1/skyhook_types.go
index faa68ed2..4415d56e 100644
--- a/operator/api/v1alpha1/skyhook_types.go
+++ b/operator/api/v1alpha1/skyhook_types.go
@@ -27,7 +27,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/internal/graph"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/api/v1alpha1/skyhook_webhook.go b/operator/api/v1alpha1/skyhook_webhook.go
index 2b57654a..e703c445 100644
--- a/operator/api/v1alpha1/skyhook_webhook.go
+++ b/operator/api/v1alpha1/skyhook_webhook.go
@@ -24,8 +24,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/internal/graph"
-	semver "github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
+	semver "github.com/NVIDIA/skyhook/operator/internal/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
diff --git a/operator/cmd/main.go b/operator/cmd/main.go
index 416095df..65972495 100644
--- a/operator/cmd/main.go
+++ b/operator/cmd/main.go
@@ -42,9 +42,9 @@ import (
 	kzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/controller"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/controller"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	//+kubebuilder:scaffold:imports
 )
diff --git a/operator/go.mod b/operator/go.mod
index 8c3a0367..a9af3390 100644
--- a/operator/go.mod
+++ b/operator/go.mod
@@ -1,4 +1,4 @@
-module github.com/NVIDIA/skyhook
+module github.com/NVIDIA/skyhook/operator
 
 go 1.24.0
 
diff --git a/operator/internal/controller/annotations.go b/operator/internal/controller/annotations.go
index 595dfc0d..35a5c1a2 100644
--- a/operator/internal/controller/annotations.go
+++ b/operator/internal/controller/annotations.go
@@ -22,7 +22,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/operator/internal/controller/cert_utils.go b/operator/internal/controller/cert_utils.go
index 743e3581..36c01706 100644
--- a/operator/internal/controller/cert_utils.go
+++ b/operator/internal/controller/cert_utils.go
@@ -32,7 +32,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/controller/cluster_state_v2.go b/operator/internal/controller/cluster_state_v2.go
index fd81c9ec..494787fd 100644
--- a/operator/internal/controller/cluster_state_v2.go
+++ b/operator/internal/controller/cluster_state_v2.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/version"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
diff --git a/operator/internal/controller/cluster_state_v2_test.go b/operator/internal/controller/cluster_state_v2_test.go
index 74533ef1..d74871a2 100644
--- a/operator/internal/controller/cluster_state_v2_test.go
+++ b/operator/internal/controller/cluster_state_v2_test.go
@@ -22,9 +22,9 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	skyhookNodesMock "github.com/NVIDIA/skyhook/internal/controller/mock"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	skyhookNodesMock "github.com/NVIDIA/skyhook/operator/internal/controller/mock"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/controller/event_handler.go b/operator/internal/controller/event_handler.go
index ff8de901..4e484bd6 100644
--- a/operator/internal/controller/event_handler.go
+++ b/operator/internal/controller/event_handler.go
@@ -21,8 +21,8 @@ package controller
 import (
 	"context"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
diff --git a/operator/internal/controller/event_handler_test.go b/operator/internal/controller/event_handler_test.go
index cced57e5..5c4885a6 100644
--- a/operator/internal/controller/event_handler_test.go
+++ b/operator/internal/controller/event_handler_test.go
@@ -25,11 +25,11 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 
 	// . "github.com/onsi/gomega"
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
-	dalmock "github.com/NVIDIA/skyhook/internal/dal/mock"
-	MockClient "github.com/NVIDIA/skyhook/internal/mocks/client"
-	"github.com/NVIDIA/skyhook/internal/mocks/workqueue"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
+	dalmock "github.com/NVIDIA/skyhook/operator/internal/dal/mock"
+	MockClient "github.com/NVIDIA/skyhook/operator/internal/mocks/client"
+	"github.com/NVIDIA/skyhook/operator/internal/mocks/workqueue"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/controller/metrics.go b/operator/internal/controller/metrics.go
index 3868a81a..d616b19f 100644
--- a/operator/internal/controller/metrics.go
+++ b/operator/internal/controller/metrics.go
@@ -19,7 +19,7 @@
 package controller
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	"github.com/prometheus/client_golang/prometheus"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
diff --git a/operator/internal/controller/mock/SkyhookNodes.go b/operator/internal/controller/mock/SkyhookNodes.go
index f42d8e94..81c45e9c 100644
--- a/operator/internal/controller/mock/SkyhookNodes.go
+++ b/operator/internal/controller/mock/SkyhookNodes.go
@@ -23,8 +23,8 @@
 package controller
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	"github.com/go-logr/logr"
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/operator/internal/controller/pod_controller.go b/operator/internal/controller/pod_controller.go
index 2a982353..939d886b 100644
--- a/operator/internal/controller/pod_controller.go
+++ b/operator/internal/controller/pod_controller.go
@@ -23,8 +23,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/controller/skyhook_controller.go b/operator/internal/controller/skyhook_controller.go
index c848c9e3..02f8888b 100644
--- a/operator/internal/controller/skyhook_controller.go
+++ b/operator/internal/controller/skyhook_controller.go
@@ -32,10 +32,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/dal"
-	"github.com/NVIDIA/skyhook/internal/version"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/dal"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	"github.com/go-logr/logr"
 
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/controller/skyhook_controller_test.go b/operator/internal/controller/skyhook_controller_test.go
index b51a977b..43231378 100644
--- a/operator/internal/controller/skyhook_controller_test.go
+++ b/operator/internal/controller/skyhook_controller_test.go
@@ -24,9 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	skyhookNodesMock "github.com/NVIDIA/skyhook/internal/controller/mock"
-	"github.com/NVIDIA/skyhook/internal/wrapper"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	skyhookNodesMock "github.com/NVIDIA/skyhook/operator/internal/controller/mock"
+	"github.com/NVIDIA/skyhook/operator/internal/wrapper"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/controller/suite_test.go b/operator/internal/controller/suite_test.go
index 14181a35..6c248196 100644
--- a/operator/internal/controller/suite_test.go
+++ b/operator/internal/controller/suite_test.go
@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sethvargo/go-envconfig"
diff --git a/operator/internal/controller/webhook_controller.go b/operator/internal/controller/webhook_controller.go
index ceae38cf..8f7e7053 100644
--- a/operator/internal/controller/webhook_controller.go
+++ b/operator/internal/controller/webhook_controller.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/operator/internal/controller/webhook_controller_test.go b/operator/internal/controller/webhook_controller_test.go
index 8ab549aa..ec6a1983 100644
--- a/operator/internal/controller/webhook_controller_test.go
+++ b/operator/internal/controller/webhook_controller_test.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
diff --git a/operator/internal/dal/dal.go b/operator/internal/dal/dal.go
index 35ccb55b..ca1f7ccb 100644
--- a/operator/internal/dal/dal.go
+++ b/operator/internal/dal/dal.go
@@ -22,7 +22,7 @@ import (
 	"context"
 	"fmt"
 
-	skyhookv1alpha1 "github.com/NVIDIA/skyhook/api/v1alpha1"
+	skyhookv1alpha1 "github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/operator/internal/dal/mock/DAL.go b/operator/internal/dal/mock/DAL.go
index 8b77130d..8af852fa 100644
--- a/operator/internal/dal/mock/DAL.go
+++ b/operator/internal/dal/mock/DAL.go
@@ -25,7 +25,7 @@ package dal
 import (
 	"context"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	mock "github.com/stretchr/testify/mock"
 	"k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/operator/internal/wrapper/node.go b/operator/internal/wrapper/node.go
index f1e18944..8e6e8a45 100644
--- a/operator/internal/wrapper/node.go
+++ b/operator/internal/wrapper/node.go
@@ -24,9 +24,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/graph"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/graph"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/operator/internal/wrapper/node_test.go b/operator/internal/wrapper/node_test.go
index e7660de0..ea5e2bec 100644
--- a/operator/internal/wrapper/node_test.go
+++ b/operator/internal/wrapper/node_test.go
@@ -19,7 +19,7 @@
 package wrapper
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
diff --git a/operator/internal/wrapper/skyhook.go b/operator/internal/wrapper/skyhook.go
index f3efaf2f..aaaac7d2 100644
--- a/operator/internal/wrapper/skyhook.go
+++ b/operator/internal/wrapper/skyhook.go
@@ -21,8 +21,8 @@ package wrapper
 import (
 	"fmt"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
-	"github.com/NVIDIA/skyhook/internal/version"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/internal/version"
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/operator/internal/wrapper/skyhook_test.go b/operator/internal/wrapper/skyhook_test.go
index b0f86290..c5748f4c 100644
--- a/operator/internal/wrapper/skyhook_test.go
+++ b/operator/internal/wrapper/skyhook_test.go
@@ -19,7 +19,7 @@
 package wrapper
 
 import (
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/operator/internal/wrapper/zz.migration.0.5.0.go b/operator/internal/wrapper/zz.migration.0.5.0.go
index 0c57e2eb..26e615d4 100644
--- a/operator/internal/wrapper/zz.migration.0.5.0.go
+++ b/operator/internal/wrapper/zz.migration.0.5.0.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/NVIDIA/skyhook/api/v1alpha1"
+	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	"github.com/go-logr/logr"
 )