diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e364945..bcaedc3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,7 +100,7 @@ jobs:
       # We could run 'make lint' but we prefer this action because it leaves
       # 'annotations' (i.e. it comments on PRs to point out linter violations).
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 77a1900..e04d71b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -7,6 +7,8 @@ on:
 jobs:
   e2e:
     uses: upbound/official-providers-ci/.github/workflows/pr-comment-trigger.yml@standard-runners
+    with:
+      go-version: 1.23
     secrets:
       UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
       UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
diff --git a/cluster/test/setup.sh b/cluster/test/setup.sh
index 8012785..23f9e2a 100755
--- a/cluster/test/setup.sh
+++ b/cluster/test/setup.sh
@@ -13,7 +13,7 @@ ${KUBECTL} -n upbound-system wait --for=condition=Available deployment --all --t
 
 echo "Creating a default provider config..."
 cat <<EOF | ${KUBECTL} apply -f -
-apiVersion: upjet-ionoscloud.upbound.io/v1beta1
+apiVersion: upjet-ionoscloud.ionoscloud.io/v1beta1
 kind: ProviderConfig
 metadata:
   name: default
@@ -24,3 +24,4 @@ spec:
       name: provider-secret
       namespace: upbound-system
       key: credentials
+EOF
diff --git a/config/provider.go b/config/provider.go
index 09d37f1..0e1ab2d 100644
--- a/config/provider.go
+++ b/config/provider.go
@@ -128,6 +128,10 @@ func addTFSingletonConversion(pc *config.Provider) {
 			continue
 		}
 
+		if r.ShouldUseTerraformPluginFrameworkClient() {
+			continue
+		}
+
 		// the controller will be reconciling on the CRD API version
 		// with the converted API (with embedded objects in place of
 		// singleton lists), so we need the appropriate Terraform
diff --git a/examples/mongodb/cluster.yaml b/examples/mongodb/cluster.yaml
index 1f748c9..1a5beb9 100644
--- a/examples/mongodb/cluster.yaml
+++ b/examples/mongodb/cluster.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   forProvider:
     description: datacenter description
-    location: es/vit
+    location: de/txl
     name: Datacenter Example
     secAuthProtection: false
 ---
@@ -41,7 +41,7 @@ spec:
   forProvider:
     connections:
         cidrList:
-          - 192.168.1.108/24
+          - 192.168.1.110/24
         datacenterIdSelector:
           matchLabels:
             testing.upbound.io/example-name: datacenter_example
diff --git a/examples/s3/bucket.yaml b/examples/s3/bucket.yaml
index cde0468..d89f6f0 100644
--- a/examples/s3/bucket.yaml
+++ b/examples/s3/bucket.yaml
@@ -5,7 +5,7 @@ metadata:
     meta.upbound.io/example-id: s3/v1alpha1/bucket
   labels:
     testing.upbound.io/example-name: example
-  name: unique-bucket-name
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider:
     forceDestroy: true
diff --git a/examples/s3/bucketcorsconfiguration.yaml b/examples/s3/bucketcorsconfiguration.yaml
index b45f394..0fa7c9e 100644
--- a/examples/s3/bucketcorsconfiguration.yaml
+++ b/examples/s3/bucketcorsconfiguration.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketcorsconfiguration
   labels:
-    testing.upbound.io/example-name: example
-  name: darius-v-test
+    testing.upbound.io/example-name: cors
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -21,7 +21,7 @@ spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: cors
     corsRule:
     - allowedHeaders:
       - '*'
diff --git a/examples/s3/bucketlifecycleconfiguration.yaml b/examples/s3/bucketlifecycleconfiguration.yaml
index 320fc45..ca0f392 100644
--- a/examples/s3/bucketlifecycleconfiguration.yaml
+++ b/examples/s3/bucketlifecycleconfiguration.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketlifecycleconfiguration
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: lifecycle
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -15,13 +15,13 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketlifecycleconfiguration
   labels:
-    testing.upbound.io/example-name: example
+    testing.upbound.io/example-name: lifecycle
   name: example
 spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: lifecycle
     rule:
     - expiration:
         days: 30
diff --git a/examples/s3/bucketobjectlockconfiguration.yaml b/examples/s3/bucketobjectlockconfiguration.yaml
index 5b82a37..6417f00 100644
--- a/examples/s3/bucketobjectlockconfiguration.yaml
+++ b/examples/s3/bucketobjectlockconfiguration.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketobjectlockconfiguration
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: object-lock
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider:
     objectLockEnabled: true
@@ -22,7 +22,7 @@ spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: object-lock
     objectLockEnabled: Enabled
     rule:
       defaultRetention:
diff --git a/examples/s3/bucketpolicy.yaml b/examples/s3/bucketpolicy.yaml
index df40bc3..eb8e5a0 100644
--- a/examples/s3/bucketpolicy.yaml
+++ b/examples/s3/bucketpolicy.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketpolicy
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: policy
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -21,7 +21,7 @@ spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: policy
     policy: |-
       {
         "Version": "2012-10-17",
diff --git a/examples/s3/bucketpublicaccessblock.yaml b/examples/s3/bucketpublicaccessblock.yaml
index 85f9600..5a6fb27 100644
--- a/examples/s3/bucketpublicaccessblock.yaml
+++ b/examples/s3/bucketpublicaccessblock.yaml
@@ -5,13 +5,24 @@ metadata:
     meta.upbound.io/example-id: s3/v1alpha1/bucketpublicaccessblock
   labels:
     testing.upbound.io/example-name: example
-  name: unique-bucket-name
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider:
     blockPublicAcls: true
     blockPublicPolicy: true
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: object-lock
     ignorePublicAcls: false
     restrictPublicBuckets: false
+---
+apiVersion: s3.ionoscloud.io/v1alpha1
+kind: Bucket
+metadata:
+  annotations:
+    meta.upbound.io/example-id: s3/v1alpha1/bucketobjectlockconfiguration
+  labels:
+    testing.upbound.io/example-name: object-lock
+  name: ${Rand.RFC1123Subdomain}
+spec:
+  forProvider: {}
diff --git a/examples/s3/bucketserversideencryptionconfiguration.yaml b/examples/s3/bucketserversideencryptionconfiguration.yaml
index 9efcc56..03ecf70 100644
--- a/examples/s3/bucketserversideencryptionconfiguration.yaml
+++ b/examples/s3/bucketserversideencryptionconfiguration.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketserversideencryptionconfiguration
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: sse
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -15,13 +15,13 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketserversideencryptionconfiguration
   labels:
-    testing.upbound.io/example-name: example
+    testing.upbound.io/example-name: sse
   name: example
 spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: sse
     rule:
     - applyServerSideEncryptionByDefault:
         sseAlgorithm: AES256
\ No newline at end of file
diff --git a/examples/s3/bucketversioning.yaml b/examples/s3/bucketversioning.yaml
index fdd37de..93d2d8f 100644
--- a/examples/s3/bucketversioning.yaml
+++ b/examples/s3/bucketversioning.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketversioning
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: versioning
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -15,13 +15,13 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketversioning
   labels:
-    testing.upbound.io/example-name: example
+    testing.upbound.io/example-name: versioning
   name: example
 spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: versioning
     versioningConfiguration:
       status: Enabled
 
diff --git a/examples/s3/bucketwebsiteconfiguration.yaml b/examples/s3/bucketwebsiteconfiguration.yaml
index 6e9c154..d0c614b 100644
--- a/examples/s3/bucketwebsiteconfiguration.yaml
+++ b/examples/s3/bucketwebsiteconfiguration.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketwebsiteconfiguration
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: website
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 ---
@@ -15,20 +15,15 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/bucketwebsiteconfiguration
   labels:
-    testing.upbound.io/example-name: example
+    testing.upbound.io/example-name: website
   name: example
 spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: website
     indexDocument:
       suffix: index.html
     errorDocument:
       key: error.html
-    routingRule:
-      - condition:
-          keyPrefixEquals: docs/
-        redirect:
-          replaceKeyPrefixWith: documents/
 
diff --git a/examples/s3/key.yaml b/examples/s3/key.yaml
index c5e330f..4d28eda 100644
--- a/examples/s3/key.yaml
+++ b/examples/s3/key.yaml
@@ -26,8 +26,8 @@ metadata:
 spec:
   forProvider:
 #  needs to be set to true so that the user can create a key
-    administrator: false
-    email: unique@email.com
+    administrator: true
+    email: ${Rand.RFC1123Subdomain}@email.com
     firstName: example
     forceSecAuth: false
     active: true
diff --git a/examples/s3/object.yaml b/examples/s3/object.yaml
index 5fec8ad..f0cc485 100644
--- a/examples/s3/object.yaml
+++ b/examples/s3/object.yaml
@@ -4,8 +4,8 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/object
   labels:
-    testing.upbound.io/example-name: example
-  name: unique-bucket-name
+    testing.upbound.io/example-name: object
+  name: ${Rand.RFC1123Subdomain}
 spec:
   forProvider:
     objectLockEnabled: true
@@ -16,13 +16,13 @@ metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1alpha1/object
   labels:
-    testing.upbound.io/example-name: example
+    testing.upbound.io/example-name: object
   name: example
 spec:
   forProvider:
     bucketSelector:
       matchLabels:
-        testing.upbound.io/example-name: example
+        testing.upbound.io/example-name: object
     cacheControl: no-cache
     content: body
     contentDisposition: attachment
diff --git a/examples/s3/objectcopy.yaml b/examples/s3/objectcopy.yaml
index 5b9a5e8..c411cc1 100644
--- a/examples/s3/objectcopy.yaml
+++ b/examples/s3/objectcopy.yaml
@@ -5,7 +5,7 @@ metadata:
     meta.upbound.io/example-id: s3/v1alpha1/objectcopy
   labels:
     testing.upbound.io/example-name: source
-  name: source
+  name: source-x-test-object-copy
 spec:
   forProvider: {}
 
@@ -18,7 +18,7 @@ metadata:
     meta.upbound.io/example-id: s3/v1alpha1/objectcopy
   labels:
     testing.upbound.io/example-name: target
-  name: target
+  name: target-${Rand.RFC1123Subdomain}
 spec:
   forProvider: {}
 
@@ -56,4 +56,4 @@ spec:
       matchLabels:
         testing.upbound.io/example-name: target
     key: example
-    source: source/source_object
+    source: source-x-test-object-copy/source_object
diff --git a/go.mod b/go.mod
index ac84a0f..bea67a4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/ionos-cloud/provider-upjet-ionoscloud
 
-go 1.22.0
-
-toolchain go1.22.4
+go 1.23
 
 require (
 	dario.cat/mergo v1.0.0