diff --git a/.github/workflows/publish-provider-packages.yaml b/.github/workflows/publish-provider-packages.yaml
index 7f405865..34dfab71 100644
--- a/.github/workflows/publish-provider-packages.yaml
+++ b/.github/workflows/publish-provider-packages.yaml
@@ -15,14 +15,15 @@ on:
       platform:
         type: choice
         description: "Platform string to use while building and publishing the packages (e.g. linux_amd64 linux_arm64)"
-        default: 'linux_amd64'
-        options: 
+        default: linux_amd64 linux_arm64
+        options:
+        - linux_amd64 linux_arm64
         - linux_amd64
         - linux_arm64
         required: true
       go-version:
         description: 'Go version to use if building needs to be done'
-        default: '1.24'
+        default: '1.25'
         required: false
       size:
         description: "Number of smaller provider packages to build and push with each build job"
@@ -117,7 +118,7 @@ jobs:
         run: |
           go install golang.org/x/tools/cmd/goimports@latest
           make generate
-          make SUBPACKAGES="${{ inputs.subpackages }}" PLATFORMS=${{ inputs.platform }} build
+          make SUBPACKAGES="${{ inputs.subpackages }}" PLATFORMS="${{ inputs.platform }}" build
         env:
           # We're using docker buildx, which doesn't actually load the images it
           # builds by default. Specifying --load does so.
@@ -125,4 +126,4 @@ jobs:
 
       - name: Publish Artifacts
         run: |
-          make SUBPACKAGES_FOR_BATCH="${{ inputs.subpackages }}" XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" VERSION=${{ inputs.version }} BATCH_PLATFORMS=${{ inputs.platform }} publish-subpackages
\ No newline at end of file
+          make SUBPACKAGES_FOR_BATCH="${{ inputs.subpackages }}" XPKG_REG_ORGS="${{ env.CROSSPLANE_REGORG }}" VERSION=${{ inputs.version }} BATCH_PLATFORMS="$(echo ${{ inputs.platform }} | tr ' ' ',')" publish-subpackages
diff --git a/Makefile b/Makefile
index 1dc45964..6ac52e41 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ NPROCS ?= 1
 # to half the number of CPU cores.
 GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
 
-GO_REQUIRED_VERSION ?= 1.24
+GO_REQUIRED_VERSION ?= 1.25
 GOLANGCILINT_VERSION ?= 1.50.0
 GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator
 GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
diff --git a/go.mod b/go.mod
index 107cdeee..1896ea02 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/oracle/provider-oci
 
-go 1.24.0
-
-toolchain go1.24.5
+go 1.25.0
 
 require (
 	dario.cat/mergo v1.0.2
diff --git a/package/crds/dns.oci.upbound.io_zones.yaml b/package/crds/dns.oci.upbound.io_zones.yaml
index b5c56b88..e2752b70 100644
--- a/package/crds/dns.oci.upbound.io_zones.yaml
+++ b/package/crds/dns.oci.upbound.io_zones.yaml
@@ -230,7 +230,7 @@ spec:
                       publicly resolvable and not part of a private view.
                     type: string
                   viewIdRef:
-                    description: Reference to a View to populate viewId.
+                    description: Reference to a View in dns to populate viewId.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -264,7 +264,7 @@ spec:
                     - name
                     type: object
                   viewIdSelector:
-                    description: Selector for a View to populate viewId.
+                    description: Selector for a View in dns to populate viewId.
                     properties:
                       matchControllerRef:
                         description: |-
@@ -478,7 +478,7 @@ spec:
                       publicly resolvable and not part of a private view.
                     type: string
                   viewIdRef:
-                    description: Reference to a View to populate viewId.
+                    description: Reference to a View in dns to populate viewId.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -512,7 +512,7 @@ spec:
                     - name
                     type: object
                   viewIdSelector:
-                    description: Selector for a View to populate viewId.
+                    description: Selector for a View in dns to populate viewId.
                     properties:
                       matchControllerRef:
                         description: |-