diff --git a/manifests/fine-tuning-6B/base-modules.yaml b/manifests/fine-tuning-6B/base-modules.yaml
new file mode 100644
index 00000000..f9f2e8f5
--- /dev/null
+++ b/manifests/fine-tuning-6B/base-modules.yaml
@@ -0,0 +1,26 @@
+name: networking
+path: git::https://github.com/awslabs/idf-modules.git//modules/network/basic-cdk?ref=release/1.11.0&depth=1
+parameters:
+  - name: InternetAccessible
+    value: true
+---
+name: buckets
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/buckets?ref=release/1.11.0&depth=1
+parameters:
+  - name: EncryptionType
+    value: SSE
+  - name: RetentionType
+    value: DESTROY
+---
+name: ray-ecr
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/ecr?ref=release/1.11.0&depth=1
+targetAccount: primary
+parameters:
+  - name: ImageTagMutability
+    value: MUTABLE
+  - name: ImageScanOnPush
+    value: True
+  - name: Encryption
+    value: KMS_MANAGED
+  - name: RemovalPolicy
+    value: DESTROY
diff --git a/manifests/fine-tuning-6B/deployment.yaml b/manifests/fine-tuning-6B/deployment.yaml
index 442f5efa..40672468 100644
--- a/manifests/fine-tuning-6B/deployment.yaml
+++ b/manifests/fine-tuning-6B/deployment.yaml
@@ -1,17 +1,17 @@
-name: ray-on-eks
+name: fine-tuning-6B
 forceDependencyRedeploy: True
 toolchainRegion: us-east-1
 groups:
   - name: base
-    path: manifests/ray-on-eks/base-modules.yaml
+    path: manifests/fine-tuning-6B/base-modules.yaml
   - name: images
-    path: manifests/ray-on-eks/images-modules.yaml
+    path: manifests/fine-tuning-6B/images-modules.yaml
   - name: core
     path: manifests/fine-tuning-6B/core-modules.yaml
   - name: integration
-    path: manifests/ray-on-eks/integration-modules.yaml
+    path: manifests/fine-tuning-6B/integration-modules.yaml
   - name: ray-operator
-    path: manifests/ray-on-eks/ray-operator-modules.yaml
+    path: manifests/fine-tuning-6B/ray-operator-modules.yaml
   - name: ray-cluster
     path: manifests/fine-tuning-6B/ray-cluster-modules.yaml
 targetAccountMappings:
@@ -25,7 +25,6 @@ targetAccountMappings:
       rayNamespaceName: ray
       draImportPath: /ray/import/
       draExportPath: /ray/export/
-      dockerCredentialsSecret: docker-credential
     regionMappings:
       - region: us-east-1
         default: true
diff --git a/manifests/fine-tuning-6B/images-modules.yaml b/manifests/fine-tuning-6B/images-modules.yaml
new file mode 100644
index 00000000..a4705241
--- /dev/null
+++ b/manifests/fine-tuning-6B/images-modules.yaml
@@ -0,0 +1,10 @@
+name: ray
+path: git::https://github.com/awslabs/aiops-modules.git//modules/eks/ray-image?ref=release/1.5.0&depth=1
+targetAccount: primary
+parameters:
+  - name: EcrRepoName
+    valueFrom:
+      moduleMetadata:
+        group: base
+        name: ray-ecr
+        key: EcrRepositoryName
diff --git a/manifests/fine-tuning-6B/integration-modules.yaml b/manifests/fine-tuning-6B/integration-modules.yaml
new file mode 100644
index 00000000..f4b1fb89
--- /dev/null
+++ b/manifests/fine-tuning-6B/integration-modules.yaml
@@ -0,0 +1,63 @@
+name: lustre-on-eks
+path: git::https://github.com/awslabs/idf-modules.git//modules/integration/fsx-lustre-on-eks?ref=release/1.11.0&depth=1
+parameters:
+  - name: EksClusterAdminRoleArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterMasterRoleArn
+  - name: EksHandlerRoleArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksHandlerRoleArn
+  - name: EksClusterName
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterName
+  - name: EksOidcArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksOidcArn
+  - name: EksClusterSecurityGroupId
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterSecurityGroupId
+  - name: Namespace
+    valueFrom:
+      parameterValue: rayNamespaceName
+  - name: FsxFileSystemId
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: fsx-lustre
+        key: FSxLustreFileSystemId
+  - name: FsxSecurityGroupId
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: fsx-lustre
+        key: FSxLustreSecurityGroup
+  - name: FsxMountName
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: fsx-lustre
+        key: FSxLustreMountName
+  - name: FsxDnsName
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: fsx-lustre
+        key: FSxLustreAttrDnsName
+  - name: DraExportPath
+    valueFrom:
+      parameterValue: draExportPath
diff --git a/manifests/fine-tuning-6B/ray-operator-modules.yaml b/manifests/fine-tuning-6B/ray-operator-modules.yaml
new file mode 100644
index 00000000..45bfb2e6
--- /dev/null
+++ b/manifests/fine-tuning-6B/ray-operator-modules.yaml
@@ -0,0 +1,60 @@
+name: ray-operator
+path: git::https://github.com/awslabs/aiops-modules.git//modules/eks/ray-operator?ref=release/1.5.0&depth=1
+parameters:
+  - name: EksClusterAdminRoleArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterMasterRoleArn
+  - name: EksHandlerRoleArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksHandlerRoleArn
+  - name: EksClusterName
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterName
+  - name: EksClusterEndpoint
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterEndpoint
+  - name: EksOidcArn
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksOidcArn
+  - name: EksOpenidIssuer
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterOpenIdConnectIssuer
+  - name: EksCertAuthData
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterCertAuthData
+  - name: EksClusterSecurityGroupId
+    valueFrom:
+      moduleMetadata:
+        group: core
+        name: eks
+        key: EksClusterSecurityGroupId
+  - name: Namespace
+    valueFrom:
+      parameterValue: rayNamespaceName
+  - name: DataBucketName
+    valueFrom:
+      moduleMetadata:
+        group: base
+        name: buckets
+        key: ArtifactsBucketName