diff --git a/.github/workflows/cgroup.yaml b/.github/workflows/cgroup.yaml
index feeb92fdc3..db9ee8580a 100644
--- a/.github/workflows/cgroup.yaml
+++ b/.github/workflows/cgroup.yaml
@@ -24,22 +24,11 @@ permissions:
   contents: read
   
 jobs:
-  prep:
-    name: "Prepare"
-    runs-on: ubuntu-20.04
-    timeout-minutes: 40
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v3
-        with: { fetch-depth: 1 }
-      - name: "Build"
-        run: DOCKER_BUILDKIT=1 SKIP_VALIDATE=1 make
-      - name: "Upload"
-        uses: actions/upload-artifact@v3
-        with: { name: k3s, path: dist/artifacts/k3s }
+  build:
+    uses: ./.github/workflows/build-k3s.yaml
   test:
     name: "Conformance Test"
-    needs: prep
+    needs: build
     # nested virtualization is only available on macOS hosts
     runs-on: macos-12
     timeout-minutes: 40
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 1d86ff4d4f..cbb23150f8 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -30,7 +30,7 @@ jobs:
     needs: build
     name: Integration Tests
     runs-on: ubuntu-20.04
-    timeout-minutes: 30
+    timeout-minutes: 45
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/scripts/package b/scripts/package
index 51b8f417bb..ca2123657e 100755
--- a/scripts/package
+++ b/scripts/package
@@ -8,7 +8,9 @@ if [ ! -e ../bin/containerd ]; then
 fi
 
 ./package-cli
-./package-image
+if [ -z "$SKIP_IMAGE" ]; then
+    ./package-image
+fi
 if [ -z "$SKIP_AIRGAP" ]; then
     ./package-airgap
 fi
diff --git a/tests/integration/kubeflags/kubeflags_test.go b/tests/integration/kubeflags/kubeflags_test.go
index 70bfe09d0f..849f4f3841 100644
--- a/tests/integration/kubeflags/kubeflags_test.go
+++ b/tests/integration/kubeflags/kubeflags_test.go
@@ -14,7 +14,7 @@ var server *testutil.K3sServer
 var serverArgs = []string{"--cluster-init",
 	"--kube-apiserver-arg", "advertise-port=1234",
 	"--kube-controller-manager-arg", "allocate-node-cidrs=false",
-	"--kube-scheduler-arg", "authentication-kubeconfig=test",
+	"--kube-scheduler-arg", "allow-metric-labels=metric1,label1='v3'",
 	"--kube-cloud-controller-manager-arg", "allocate-node-cidrs=false",
 	"--kubelet-arg", "address=127.0.0.1",
 	"--kube-proxy-arg", "cluster-cidr=127.0.0.1/16",
@@ -52,7 +52,7 @@ var _ = Describe("create a new cluster with kube-* flags", Ordered, func() {
 		})
 		It("should find kube-scheduler starting", func() {
 			Eventually(func() error {
-				match, err := testutil.SearchK3sLog(server, "Running kube-scheduler --authentication-kubeconfig=test")
+				match, err := testutil.SearchK3sLog(server, "Running kube-scheduler --allow-metric-labels=metric1,label1='v3'")
 				if err != nil {
 					return err
 				}