diff --git a/.github/workflows/build-all-distros-nightly.yaml b/.github/workflows/build-all-distros-nightly.yaml
index ed9b38629a..9292692ea6 100644
--- a/.github/workflows/build-all-distros-nightly.yaml
+++ b/.github/workflows/build-all-distros-nightly.yaml
@@ -60,4 +60,4 @@ jobs:
           message: ":ahhhhhhhhh: build-all-distros has failed"
           channel: team-pitch-black
           color: red
-          verbose: true
+          verbose: true
\ No newline at end of file
diff --git a/.github/workflows/link-checker.yaml b/.github/workflows/link-checker.yaml
index 722b1cccfc..16826fcd3a 100644
--- a/.github/workflows/link-checker.yaml
+++ b/.github/workflows/link-checker.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
           cache: false
       - name: Install doc dependencies
         run: make install-site-deps
diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
index 21fd71dda9..0caa985baa 100644
--- a/.github/workflows/publish-docs.yaml
+++ b/.github/workflows/publish-docs.yaml
@@ -51,4 +51,4 @@ jobs:
           message: ":ahhhhhhhhh: Docs publishing failed."
           channel: team-pitch-black
           color: red
-          verbose: true
+          verbose: true
\ No newline at end of file
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index 8a0e218a32..8b13789179 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -1,102 +1 @@
 
-name: test-and-build
-
-on:
-  pull_request: {}
-  workflow_call: {}
-
-jobs:
-  unit-test:
-    name: Unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
-        with:
-          fetch-depth: 0
-      - name: Setup Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
-        with:
-          go-version: 1.20.x
-          cache: false
-      - name: Cache go-build and mod
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
-        with:
-          path: |
-            ~/.cache/go-build/
-            ~/go/pkg/mod/
-          key: go-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            go-
-      - name: Setup deps
-        run: |
-          make install-build-deps
-      - name: Unit test
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make build
-          PATH=$PATH:$(go env GOPATH)/bin make unit-test-no-generate
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
-=======
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 #v4.1.2
->>>>>>> 3a0026362 (Bump dependencies)
-        with:
-          fetch-depth: 0
-      - name: Setup Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
-        with:
-          go-version: 1.20.x
-          cache: false
-      - name: Cache go-build and mod
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
-        with:
-          path: |
-            ~/.cache/go-build/
-            ~/go/pkg/mod/
-          key: go-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            go-
-      - name: Setup deps
-        run: |
-          make install-build-deps
-      - name: Lint
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make lint
-  image:
-    name: Build and check image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4
-=======
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 #v4.1.2
->>>>>>> 3a0026362 (Bump dependencies)
-        with:
-          fetch-depth: 0
-      - name: Setup Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
-        with:
-          go-version: 1.20.x
-          cache: false
-      - name: Cache go-build and mod
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
-        with:
-          path: |
-            ~/.cache/go-build/
-            ~/go/pkg/mod/
-          key: go-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            go-
-      - name: Setup deps
-        run: |
-          make install-build-deps
-      - name: build
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker check-build-image-manifest-up-to-date
-
diff --git a/pkg/cfn/builder/managed_launch_template.go b/pkg/cfn/builder/managed_launch_template.go
index 97c0e5a4ca..d9fd166000 100644
--- a/pkg/cfn/builder/managed_launch_template.go
+++ b/pkg/cfn/builder/managed_launch_template.go
@@ -34,6 +34,9 @@ func (m *ManagedNodeGroupResourceSet) makeLaunchTemplateData(ctx context.Context
 				CapacityReservationResourceGroupArn: valueOrNil(mng.CapacityReservation.CapacityReservationTarget.CapacityReservationResourceGroupARN),
 			}
 		}
+		tmp := "capacity-block"
+		launchTemplateData.InstanceMarketOptions = &gfnec2.LaunchTemplate_InstanceMarketOptions{}
+		launchTemplateData.InstanceMarketOptions.MarketType = valueOrNil(&tmp)
 	}
 
 	userData, err := m.bootstrapper.UserData()
diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go
index a09f461f51..50ac5f7c84 100644
--- a/pkg/cfn/builder/nodegroup.go
+++ b/pkg/cfn/builder/nodegroup.go
@@ -451,9 +451,9 @@ func newLaunchTemplateData(ctx context.Context, n *NodeGroupResourceSet) (*gfnec
 		},
 		ImageId:           gfnt.NewString(ng.AMI),
 		UserData:          gfnt.NewString(userData),
-		MetadataOptions:   makeMetadataOptions(n.spec.NodeGroupBase),
-		TagSpecifications: makeTags(n.spec.NodeGroupBase, n.clusterSpec.Metadata),
-		EnclaveOptions: &gfnec2.LaunchTemplate_EnclaveOptions{
+		MetadataOptions:   makeMetadataOptions(ng.NodeGroupBase),
+		TagSpecifications: makeTags(ng.NodeGroupBase, n.options.ClusterConfig.Metadata),
+    EnclaveOptions: &gfnec2.LaunchTemplate_EnclaveOptions{
 			Enabled: gfnt.NewBoolean(n.spec.EnclaveEnabled),
 		},
 	}
@@ -473,6 +473,9 @@ func newLaunchTemplateData(ctx context.Context, n *NodeGroupResourceSet) (*gfnec
 				CapacityReservationResourceGroupArn: valueOrNil(ng.CapacityReservation.CapacityReservationTarget.CapacityReservationResourceGroupARN),
 			}
 		}
+		tmp := "capacity-block"
+		launchTemplateData.InstanceMarketOptions = &gfnec2.LaunchTemplate_InstanceMarketOptions{}
+		launchTemplateData.InstanceMarketOptions.MarketType = valueOrNil(&tmp)
 	}
 
 	if err := buildNetworkInterfaces(ctx, launchTemplateData, ng.InstanceTypeList(), api.IsEnabled(ng.EFAEnabled), n.securityGroups, n.ec2API); err != nil {