diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index f65ecc27..a1882ed3 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: k8s.gcr.io/nfd/node-feature-discovery-operator
-  newTag: v0.2.0
+  newTag: v0.4.0
diff --git a/config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml b/config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml
index 4a93614f..1b71b82d 100644
--- a/config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml
+++ b/config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml
@@ -11,8 +11,8 @@ spec:
   #resourceLabels:
   #  - "example.com/resource"
   operand:
-    image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
-    imagePullPolicy: Always
+    image: gcr.io/k8s-staging-nfd/node-feature-discovery:v0.10.1
+    imagePullPolicy: IfNotPresent
     servicePort: 12000
   workerConfig:
     configData: |
diff --git a/docs/_config.yml b/docs/_config.yml
index 18b3c7e9..838bbf61 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -42,15 +42,15 @@ remote_theme: rundocs/jekyll-rtd-theme@v2.0.10
 #   - vendor/ruby/
 
 # Document versioning
-version: master
+version: v0.4
 display_version_list: true
 
 # Release is the full released version number. Used to make external links to
 # point to the correct blobs in the Github repo. This is also the version shown
 # in the sidebar (top left corner of the page)
-release: master
+release: v0.4.0
 
 # Container image which to point to in the documentation
-container_image: gcr.io/k8s-staging-nfd/node-feature-discovery-operator:master
+container_image: gcr.io/k8s-staging-nfd/node-feature-discovery-operator:v0.4.0
 # Operand Node Feature Discovery documentation version
-operand_version: master
+operand_version: v0.10.1
diff --git a/version/version.go b/version/version.go
index 980a59c6..c0c3dac4 100644
--- a/version/version.go
+++ b/version/version.go
@@ -18,5 +18,5 @@ package version
 
 var (
 	// Version tracks the NFD operator release
-	Version = "0.0.1"
+	Version = "0.4.0"
 )