diff --git a/README.adoc b/README.adoc
index 156533801..d71a1e91a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -34,7 +34,6 @@ The following environment variables are configurable and may be set by the user
 | GIT_DEPLOY_TOKEN | Authentication token
 | GIT_DEPLOY_URL | The URL for the Git service (GitHub/GitLab are supported) to archive the sources
 | GIT_DISABLE_SSL_VERIFICATION | Whether to disable SSL verification for Git archival service communication
-| JBS_CONTAINER_BUILD | Use Konflux tasks to build using containers (default: `true`)
 | JBS_QUAY_IMAGE_CONTROLLER | The name for the operator image repository. Defaults to `hacbs-jvm-controller`.
 | JBS_QUAY_IMAGE_TAG | The tag for the images (defaults to `dev`)
 | JBS_QUAY_ORG | JBS images are pulled by default from the `QUAY_USERNAME` organization. This may be overridden by changing this
diff --git a/deploy/base-development.sh b/deploy/base-development.sh
index a1fcb8b20..1dfb69fd9 100755
--- a/deploy/base-development.sh
+++ b/deploy/base-development.sh
@@ -33,9 +33,6 @@ fi
 if [ -z "$JBS_S3_SYNC_ENABLED" ]; then
     export JBS_S3_SYNC_ENABLED=false
 fi
-if [ -z "$JBS_CONTAINER_BUILDS" ]; then
-    export JBS_CONTAINER_BUILDS=true
-fi
 if [ -z "$JBS_MAX_MEMORY" ]; then
     export JBS_MAX_MEMORY=4096
 fi
@@ -81,7 +78,6 @@ ${GIT_DEPLOY_TOKEN}
 ${GIT_DEPLOY_URL}
 ${GIT_DISABLE_SSL_VERIFICATION}
 ${JBS_BUILD_IMAGE_SECRET}
-${JBS_CONTAINER_BUILDS}
 ${JBS_GIT_CREDENTIALS}
 ${JBS_QUAY_IMAGE_CONTROLLER}
 ${JBS_QUAY_IMAGE_TAG}
diff --git a/deploy/base/config.yaml b/deploy/base/config.yaml
index fb0bc4572..f0f63fa9f 100644
--- a/deploy/base/config.yaml
+++ b/deploy/base/config.yaml
@@ -5,7 +5,6 @@ metadata:
   name: jvm-build-config
 spec:
   enableRebuilds: true
-  containerBuilds: ${JBS_CONTAINER_BUILDS}
   mavenBaseLocations:
     maven-repository-300-jboss: "https://repository.jboss.org/nexus/content/groups/public/"
     maven-repository-301-confluent: "https://packages.confluent.io/maven"
diff --git a/deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml b/deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml
index d17c8d76f..90c6cecdb 100644
--- a/deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml
+++ b/deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml
@@ -92,10 +92,6 @@ spec:
                   workerThreads:
                     type: string
                 type: object
-              containerBuilds:
-                description: Whether to use a standard build pipeline or build in
-                  a Docker container via buildah.
-                type: boolean
               enableRebuilds:
                 type: boolean
               gitSourceArchive:
diff --git a/deploy/tasks/maven-deployment.yaml b/deploy/tasks/maven-deployment.yaml
new file mode 100644
index 000000000..1d43188e0
--- /dev/null
+++ b/deploy/tasks/maven-deployment.yaml
@@ -0,0 +1,92 @@
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: maven-deployment
+  annotations:
+    tekton.dev/pipelines.minVersion: 0.12.1
+    tekton.dev/tags: image-build, konflux
+  labels:
+    app.kubernetes.io/version: "0.1"
+    build.appstudio.redhat.com/build_type: docker
+spec:
+  description: |-
+    Takes a OCI archive and deploys the result
+  params:
+    - name: IMAGE_URL
+      description: Reference to the OCI archive
+      type: string
+    - name: IMAGE_DIGEST
+      description: Digest to use
+      type: string
+    - name: MVN_REPO
+      description: Maven repository to deploy to
+      type: string
+    - name: MVN_USERNAME
+      description: Maven repository username
+      type: string
+    - name: MVN_PASSWORD
+      description: Name of the secret holding the Maven repository password
+      type: string
+    - name: ORAS_OPTIONS
+      type: string
+      description: Optional environment variable string for build-trusted-artifacts
+      default: ""
+    - name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
+      description: Name of the processor image. Useful to override for development.
+      type: string
+      default: "quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:dev"
+  volumes:
+    - name: shared
+      emptyDir: {}
+    - name: workdir
+      emptyDir: {}
+  stepTemplate:
+    volumeMounts:
+      - mountPath: /shared
+        name: shared
+      - mountPath: /var/workdir
+        name: workdir
+  steps:
+    - name: restore-trusted-artifact
+      image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:d6f57d97d19008437680190908fe5444cda380f9c77d0e9efde7153720412e05
+      script: |
+        echo "Restoring artifacts to workspace"
+        URL=$IMAGE_URL
+        DIGEST=$IMAGE_DIGEST
+        AARCHIVE=$(oras manifest fetch $ORAS_OPTIONS $URL@$DIGEST | jq --raw-output '.layers[0].digest')
+        echo "URL $URL DIGEST $DIGEST AARCHIVE $AARCHIVE"
+        use-archive oci:$URL@$AARCHIVE=/var/workdir/artifacts
+      env:
+        - name: ORAS_OPTIONS
+          value: $(params.ORAS_OPTIONS)
+        - name: IMAGE_DIGEST
+          value: $(params.IMAGE_DIGEST)
+        - name: IMAGE_URL
+          value: $(params.IMAGE_URL)
+    - name: deploy
+      image: $(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE)
+      securityContext:
+        runAsUser: 0
+      computeResources:
+        limits:
+          cpu: "1"
+          memory: 2Gi
+        requests:
+          cpu: 50m
+          memory: 512Mi
+      env:
+        - name: MVN_REPO
+          value: $(params.MVN_REPO)
+        - name: MVN_USERNAME
+          value: $(params.MVN_USERNAME)
+        - name: MAVEN_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: $(params.MVN_PASSWORD)
+              key: mavenpassword
+      args:
+        - deploy
+        - --directory=/var/workdir/artifacts
+        - --mvn-repo=$(params.MVN_REPO)
+        - --mvn-username=$(params.MVN_USERNAME)
diff --git a/java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml b/java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml
index d17c8d76f..90c6cecdb 100644
--- a/java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml
+++ b/java-components/resource-model/src/main/resources/crds/jvmbuildservice.io_jbsconfigs.yaml
@@ -92,10 +92,6 @@ spec:
                   workerThreads:
                     type: string
                 type: object
-              containerBuilds:
-                description: Whether to use a standard build pipeline or build in
-                  a Docker container via buildah.
-                type: boolean
               enableRebuilds:
                 type: boolean
               gitSourceArchive:
diff --git a/openshift-with-appstudio-test/e2e/util.go b/openshift-with-appstudio-test/e2e/util.go
index 6e49f43be..fff6cb472 100644
--- a/openshift-with-appstudio-test/e2e/util.go
+++ b/openshift-with-appstudio-test/e2e/util.go
@@ -295,8 +295,7 @@ func setupConfig(t *testing.T, namespace string) *testArgs {
 			Name:      v1alpha1.JBSConfigName,
 		},
 		Spec: v1alpha1.JBSConfigSpec{
-			EnableRebuilds:  true,
-			ContainerBuilds: true,
+			EnableRebuilds: true,
 			MavenBaseLocations: map[string]string{
 				"maven-repository-300-jboss":     "https://repository.jboss.org/nexus/content/groups/public/",
 				"maven-repository-301-confluent": "https://packages.confluent.io/maven",
@@ -1070,7 +1069,6 @@ func setupMinikube(t *testing.T, namespace string) *testArgs {
 		},
 		Spec: v1alpha1.JBSConfigSpec{
 			EnableRebuilds:    true,
-			ContainerBuilds:   true,
 			AdditionalRecipes: []string{"https://github.com/jvm-build-service-test-data/recipe-repo"},
 			BuildSettings: v1alpha1.BuildSettings{
 				BuildRequestMemory: "512Mi",
diff --git a/pkg/apis/jvmbuildservice/v1alpha1/jbsconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/jbsconfig_types.go
index d34a2fe04..b3e781f04 100644
--- a/pkg/apis/jvmbuildservice/v1alpha1/jbsconfig_types.go
+++ b/pkg/apis/jvmbuildservice/v1alpha1/jbsconfig_types.go
@@ -33,7 +33,8 @@ const (
 	ConfigArtifactCacheWorkerThreadsDefault = "50"
 	ConfigArtifactCacheStorageDefault       = "10Gi"
 
-	KonfluxBuildDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
+	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/buildah-oci-ta.yaml"
+	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/KJB11/deploy/tasks/maven-deployment.yaml"
 )
 
 type JBSConfigSpec struct {
@@ -53,9 +54,6 @@ type JBSConfigSpec struct {
 	GitSourceArchive GitSourceArchive  `json:"gitSourceArchive,omitempty"`
 	CacheSettings    CacheSettings     `json:"cacheSettings,omitempty"`
 	BuildSettings    BuildSettings     `json:"buildSettings,omitempty"`
-
-	// Whether to use a standard build pipeline or build in a Docker container via buildah.
-	ContainerBuilds bool `json:"containerBuilds,omitempty"`
 }
 
 type ImageRegistrySpec struct {
diff --git a/pkg/reconciler/dependencybuild/buildrecipeyaml.go b/pkg/reconciler/dependencybuild/buildrecipeyaml.go
index a34c6e9dd..d0fe5f770 100644
--- a/pkg/reconciler/dependencybuild/buildrecipeyaml.go
+++ b/pkg/reconciler/dependencybuild/buildrecipeyaml.go
@@ -60,94 +60,89 @@ var buildEntryScript string
 //go:embed scripts/Dockerfile.build-trusted-artifacts
 var buildTrustedArtifacts string
 
-func createDeployPipelineSpec(jbsConfig *v1alpha1.JBSConfig, buildRequestProcessorImage string, gavs string) (*tektonpipeline.PipelineSpec, error) {
-	zero := int64(0)
-	mavenDeployArgs := pipelineDeployCommands(jbsConfig)
-
-	limits, err := memoryLimits(jbsConfig, 0)
-	if err != nil {
-		return nil, err
-	}
+func createDeployPipelineSpec(jbsConfig *v1alpha1.JBSConfig, buildRequestProcessorImage string) (*tektonpipeline.PipelineSpec, error) {
 	orasOptions := ""
 	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.TestRegistry] == "true" {
 		orasOptions = "--insecure --plain-http"
 	}
 
-	secretVariables := secretVariables(jbsConfig)
-	pullPolicy := pullPolicy(buildRequestProcessorImage)
-	regUrl := registryArgsWithDefaults(jbsConfig, "")
-
-	tagTask := tektonpipeline.TaskSpec{
-		Workspaces: []tektonpipeline.WorkspaceDeclaration{{Name: WorkspaceTls}, {Name: WorkspaceSource, MountPath: WorkspaceMount}},
-		Params: []tektonpipeline.ParamSpec{
-			{Name: PipelineResultPreBuildImageDigest, Type: tektonpipeline.ParamTypeString},
-			{Name: PipelineResultImageDigest, Type: tektonpipeline.ParamTypeString},
-			{Name: PipelineResultImage, Type: tektonpipeline.ParamTypeString}},
-		Steps: []tektonpipeline.Step{
-			{
-				Name:            "restore-post-build-artifacts",
-				Image:           strings.TrimSpace(strings.Split(buildTrustedArtifacts, "FROM")[1]),
-				ImagePullPolicy: v1.PullIfNotPresent,
-				SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-				Env:             secretVariables,
-				// While the manifest digest is available we need the manifest of the layer within
-				// the archive hence using 'oras manifest fetch' to extract the correct layer.
-				Script: fmt.Sprintf(`echo "Restoring artifacts and source to workspace"
-export ORAS_OPTIONS="%s"
-use-archive $(params.%s)=$(workspaces.source.path)/source
-mv $(workspaces.source.path)/source/.jbs/build.sh $(workspaces.source.path)
-URL=$(params.%s)
-DIGEST=$(params.%s)
-AARCHIVE=$(oras manifest fetch $ORAS_OPTIONS $URL@$DIGEST | jq --raw-output '.layers[0].digest')
-echo "URL $URL DIGEST $DIGEST AARCHIVE $AARCHIVE"
-use-archive oci:$URL@$AARCHIVE=$(workspaces.source.path)/artifacts`, orasOptions, PipelineResultPreBuildImageDigest, PipelineResultImage, PipelineResultImageDigest),
-			},
+	// Original deploy pipeline used to run maven deployment and also tag the images using 'oras tag'
+	// with the SHA256 encoded sum of the GAVs.
+	resolver := tektonpipeline.ResolverRef{
+		// We can use either a http or git resolver. Using http as avoids cloning an entire repository.
+		Resolver: "http",
+		Params: []tektonpipeline.Param{
 			{
-				Name:            "maven-deployment",
-				Image:           buildRequestProcessorImage,
-				ImagePullPolicy: pullPolicy,
-				SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-				Env:             secretVariables,
-				ComputeResources: v1.ResourceRequirements{
-					Requests: v1.ResourceList{"memory": limits.defaultBuildRequestMemory, "cpu": limits.defaultRequestCPU},
-					Limits:   v1.ResourceList{"memory": limits.defaultBuildRequestMemory, "cpu": limits.defaultLimitCPU},
+				Name: "url",
+				Value: tektonpipeline.ParamValue{
+					Type:      tektonpipeline.ParamTypeString,
+					StringVal: v1alpha1.KonfluxMavenDeployDefinitions,
 				},
-				Script: artifactbuild.InstallKeystoreIntoBuildRequestProcessor(mavenDeployArgs),
-			},
-			{
-				Name:            "oras-tag",
-				Image:           strings.TrimSpace(strings.Split(buildTrustedArtifacts, "FROM")[1]),
-				ImagePullPolicy: v1.PullIfNotPresent,
-				SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-				Env:             secretVariables,
-				// gavs is a comma separated list so split it into spaces
-				Script: fmt.Sprintf(`GAVS=%s
-echo "Tagging for GAVs ($GAVS)"
-oras tag %s --verbose %s@$(params.%s) ${GAVS//,/ }`, gavs, orasOptions, regUrl, PipelineResultImageDigest),
 			},
 		},
 	}
-
 	ps := &tektonpipeline.PipelineSpec{
 		Params: []tektonpipeline.ParamSpec{{Name: PipelineResultImageDigest, Type: tektonpipeline.ParamTypeString}},
 		Tasks: []tektonpipeline.PipelineTask{
 			{
 				Name: TagTaskName,
-				TaskSpec: &tektonpipeline.EmbeddedTask{
-					TaskSpec: tagTask,
+				TaskRef: &tektonpipeline.TaskRef{
+					// Can't specify name and resolver as they clash.
+					ResolverRef: resolver,
 				},
 				Params: []tektonpipeline.Param{
-					{Name: PipelineResultImage, Value: tektonpipeline.ParamValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(params." + PipelineResultImage + ")"}},
-					{Name: PipelineResultImageDigest, Value: tektonpipeline.ParamValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(params." + PipelineResultImageDigest + ")"}},
-					{Name: PipelineResultPreBuildImageDigest, Value: tektonpipeline.ParamValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(params." + PipelineResultPreBuildImageDigest + ")"}},
-				},
-				Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
-					{Name: WorkspaceTls, Workspace: WorkspaceTls},
-					{Name: WorkspaceSource, Workspace: WorkspaceSource},
+					{
+						Name: PipelineResultImage,
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: "$(params." + PipelineResultImage + ")",
+						},
+					},
+					{
+						Name: PipelineResultImageDigest,
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: "$(params." + PipelineResultImageDigest + ")",
+						},
+					},
+					{
+						Name: "MVN_REPO",
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: jbsConfig.Spec.MavenDeployment.Repository,
+						},
+					},
+					{
+						Name: "MVN_USERNAME",
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: jbsConfig.Spec.MavenDeployment.Username,
+						},
+					},
+					{
+						Name: "MVN_PASSWORD",
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: v1alpha1.MavenSecretName,
+						},
+					},
+					{
+						Name: "ORAS_OPTIONS",
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: orasOptions,
+						},
+					},
+					{
+						Name: "JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE",
+						Value: tektonpipeline.ParamValue{
+							Type:      tektonpipeline.ParamTypeString,
+							StringVal: buildRequestProcessorImage,
+						},
+					},
 				},
 			},
 		},
-		Workspaces: []tektonpipeline.PipelineWorkspaceDeclaration{{Name: WorkspaceSource}, {Name: WorkspaceTls}},
 	}
 	return ps, nil
 }
@@ -338,7 +333,6 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
 		return nil, "", "", "", err
 	}
 
-	createBuildScript := createBuildScript(build)
 	pipelineParams := []tektonpipeline.ParamSpec{
 		{Name: PipelineBuildId, Type: tektonpipeline.ParamTypeString},
 		{Name: PipelineParamScmUrl, Type: tektonpipeline.ParamTypeString},
@@ -388,7 +382,7 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
 						Requests: v1.ResourceList{"memory": limits.defaultRequestMemory, "cpu": limits.defaultRequestCPU},
 						Limits:   v1.ResourceList{"memory": limits.defaultRequestMemory, "cpu": limits.defaultLimitCPU},
 					},
-					Script: gitScript + "\n" + createBuildScript,
+					Script: gitScript,
 					Env: []v1.EnvVar{
 						{Name: PipelineParamCacheUrl, Value: "$(params." + PipelineParamCacheUrl + ")"},
 						{Name: "GIT_TOKEN", ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.GitSecretName}, Key: v1alpha1.GitSecretTokenKey, Optional: &trueBool}}},
@@ -452,172 +446,80 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
 		}
 	}
 
-	if jbsConfig.Spec.ContainerBuilds {
-		// Note - its also possible to refer to a remote pipeline ref as well as a task.
-		resolver := tektonpipeline.ResolverRef{
-			// We can use either a http or git resolver. Using http as avoids cloning an entire repository.
-			Resolver: "http",
-			Params: []tektonpipeline.Param{
-				{
-					Name: "url",
-					Value: tektonpipeline.ParamValue{
-						Type:      tektonpipeline.ParamTypeString,
-						StringVal: v1alpha1.KonfluxBuildDefinitions,
-					},
-				},
-			},
-		}
-
-		ps.Tasks = append([]tektonpipeline.PipelineTask{
+	// Note - its also possible to refer to a remote pipeline ref as well as a task.
+	resolver := tektonpipeline.ResolverRef{
+		// We can use either a http or git resolver. Using http as avoids cloning an entire repository.
+		Resolver: "http",
+		Params: []tektonpipeline.Param{
 			{
-				Name:     BuildTaskName,
-				RunAfter: runAfter,
-				TaskRef: &tektonpipeline.TaskRef{
-					// Can't specify name and resolver as they clash.
-					ResolverRef: resolver,
-				},
-				Timeout: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
-				Params: []tektonpipeline.Param{
-					{
-						Name: "DOCKERFILE",
-						Value: tektonpipeline.ParamValue{
-							Type:      tektonpipeline.ParamTypeString,
-							StringVal: ".jbs/Containerfile"},
-					},
-					{
-						Name: "IMAGE",
-						Value: tektonpipeline.ParamValue{
-							Type:      tektonpipeline.ParamTypeString,
-							StringVal: registryArgsWithDefaults(jbsConfig, buildId)},
-					},
-					{
-						Name: "SOURCE_ARTIFACT",
-						Value: tektonpipeline.ParamValue{
-							Type:      tektonpipeline.ParamTypeString,
-							StringVal: preBuildImage,
-						},
-					},
-					{
-						Name: "ORAS_OPTIONS",
-						Value: tektonpipeline.ParamValue{
-							Type:      tektonpipeline.ParamTypeString,
-							StringVal: orasOptions,
-						},
-					},
-					{
-						Name: "TLSVERIFY",
-						Value: tektonpipeline.ParamValue{
-							Type:      tektonpipeline.ParamTypeString,
-							StringVal: tlsVerify,
-						},
-					},
+				Name: "url",
+				Value: tektonpipeline.ParamValue{
+					Type:      tektonpipeline.ParamTypeString,
+					StringVal: v1alpha1.KonfluxBuildDefinitions,
 				},
+			},
+		},
+	}
 
-				// TODO: ### How to pass build-settings/tls information to buildah task?
-				//       Note - buildah-oci-ta task has no defined workspace
-				//Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
-				//	//{Name: WorkspaceBuildSettings, Workspace: WorkspaceBuildSettings},
-				//	{Name: WorkspaceSource, Workspace: WorkspaceSource},
-				//	//{Name: WorkspaceTls, Workspace: WorkspaceTls},
-				//},
-			}}, ps.Tasks...)
-
-		// Results for https://github.com/konflux-ci/build-definitions/tree/main/task/buildah-oci-ta/0.2
-		// IMAGE_DIGEST
-		// IMAGE_URL
-		ps.Results = append(ps.Results, tektonpipeline.PipelineResult{Name: PipelineResultImage, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks." + BuildTaskName + ".results." + PipelineResultImage + ")"}})
-		ps.Results = append(ps.Results, tektonpipeline.PipelineResult{Name: PipelineResultImageDigest, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks." + BuildTaskName + ".results." + PipelineResultImageDigest + ")"}})
-	} else {
-		buildTask := tektonpipeline.TaskSpec{
-			Workspaces: []tektonpipeline.WorkspaceDeclaration{{Name: WorkspaceBuildSettings}, {Name: WorkspaceSource, MountPath: WorkspaceMount}, {Name: WorkspaceTls}},
-			Params:     append(pipelineParams, tektonpipeline.ParamSpec{Name: PipelineResultPreBuildImageDigest, Type: tektonpipeline.ParamTypeString}),
-			Results: []tektonpipeline.TaskResult{
-				{Name: PipelineResultImage},
-				{Name: PipelineResultImageDigest},
+	ps.Tasks = append([]tektonpipeline.PipelineTask{
+		{
+			Name:     BuildTaskName,
+			RunAfter: runAfter,
+			TaskRef: &tektonpipeline.TaskRef{
+				// Can't specify name and resolver as they clash.
+				ResolverRef: resolver,
 			},
-			Steps: []tektonpipeline.Step{
+			Timeout: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
+			Params: []tektonpipeline.Param{
 				{
-					Name:            "restore-pre-build-source",
-					Image:           strings.TrimSpace(strings.Split(buildTrustedArtifacts, "FROM")[1]),
-					ImagePullPolicy: v1.PullIfNotPresent,
-					SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-					Env:             secretVariables,
-					Script: fmt.Sprintf(`echo "Restoring source to workspace : $(workspaces.source.path)"
-export ORAS_OPTIONS="%s"
-use-archive $(params.%s)=$(workspaces.source.path)/source
-mv $(workspaces.source.path)/source/.jbs/build.sh $(workspaces.source.path)`, orasOptions, PipelineResultPreBuildImageDigest),
+					Name: "DOCKERFILE",
+					Value: tektonpipeline.ParamValue{
+						Type:      tektonpipeline.ParamTypeString,
+						StringVal: ".jbs/Containerfile"},
 				},
 				{
-					Timeout:         &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
-					Name:            "build",
-					Image:           recipe.Image,
-					ImagePullPolicy: pullPolicy,
-					WorkingDir:      "$(workspaces." + WorkspaceSource + ".path)/source",
-					SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-					Env:             append(toolEnv, v1.EnvVar{Name: PipelineParamCacheUrl, Value: "$(params." + PipelineParamCacheUrl + ")"}),
-					ComputeResources: v1.ResourceRequirements{
-						Requests: v1.ResourceList{"memory": limits.buildRequestMemory, "cpu": limits.buildRequestCPU},
-						Limits:   v1.ResourceList{"memory": limits.buildRequestMemory, "cpu": limits.buildLimitCPU},
-					},
-					Args:   []string{"$(params.GOALS[*])"},
-					Script: "$(workspaces." + WorkspaceSource + ".path)/build.sh \"$@\"",
+					Name: "IMAGE",
+					Value: tektonpipeline.ParamValue{
+						Type:      tektonpipeline.ParamTypeString,
+						StringVal: registryArgsWithDefaults(jbsConfig, buildId)},
 				},
 				{
-					Name:            "deploy-ant-artifacts",
-					Image:           buildRequestProcessorImage,
-					ImagePullPolicy: pullPolicy,
-					SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-					Env:             secretVariables,
-					ComputeResources: v1.ResourceRequirements{
-						Requests: v1.ResourceList{"memory": limits.defaultBuildRequestMemory, "cpu": limits.defaultRequestCPU},
-						Limits:   v1.ResourceList{"memory": limits.defaultBuildRequestMemory, "cpu": limits.defaultLimitCPU},
+					Name: "SOURCE_ARTIFACT",
+					Value: tektonpipeline.ParamValue{
+						Type:      tektonpipeline.ParamTypeString,
+						StringVal: preBuildImage,
 					},
-					Script: artifactbuild.InstallKeystoreIntoBuildRequestProcessor(copyArtifactsArgs),
 				},
-				// Store post-build artifacts here using oras to match container build
 				{
-					Name:            "store-post-build-artifacts",
-					Image:           strings.TrimSpace(strings.Split(buildTrustedArtifacts, "FROM")[1]),
-					ImagePullPolicy: v1.PullIfNotPresent,
-					SecurityContext: &v1.SecurityContext{RunAsUser: &zero},
-					Env:             secretVariables,
-					Script: fmt.Sprintf(`echo "Creating post-build-image archive"
-export ORAS_OPTIONS="%s --image-spec=v1.0 --artifact-type application/vnd.oci.image.config.v1+json --no-tty --format=json"
-IMGURL=%s
-create-archive --store $IMGURL /tmp/artifacts=$(workspaces.source.path)/artifacts | tee /tmp/oras-create.json
-IMGDIGEST=$(cat /tmp/oras-create.json | grep -Ev '(Prepared artifact|Artifacts created)' | jq -r '.digest')
-echo "Storing IMGURL $IMGURL and IMGDIGEST $IMGDIGEST"
-echo -n "$IMGURL" >> $(results.%s.path)
-echo -n "$IMGDIGEST" >> $(results.%s.path)
-`, orasOptions, registryArgsWithDefaults(jbsConfig, buildId+"-artifacts"), PipelineResultImage, PipelineResultImageDigest),
+					Name: "ORAS_OPTIONS",
+					Value: tektonpipeline.ParamValue{
+						Type:      tektonpipeline.ParamTypeString,
+						StringVal: orasOptions,
+					},
 				},
-			}}
-
-		pipelineTask := []tektonpipeline.PipelineTask{{
-			Name:     BuildTaskName,
-			RunAfter: runAfter,
-			TaskSpec: &tektonpipeline.EmbeddedTask{
-				TaskSpec: buildTask,
-			},
-			Timeout: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
-			Params: []tektonpipeline.Param{
 				{
-					Name:  PipelineResultPreBuildImageDigest,
-					Value: tektonpipeline.ParamValue{Type: tektonpipeline.ParamTypeString, StringVal: preBuildImage},
+					Name: "TLSVERIFY",
+					Value: tektonpipeline.ParamValue{
+						Type:      tektonpipeline.ParamTypeString,
+						StringVal: tlsVerify,
+					},
 				},
 			},
-			Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
-				{Name: WorkspaceBuildSettings, Workspace: WorkspaceBuildSettings},
-				{Name: WorkspaceSource, Workspace: WorkspaceSource},
-				{Name: WorkspaceTls, Workspace: WorkspaceTls},
-			},
-		}}
-		ps.Tasks = append(pipelineTask, ps.Tasks...)
 
-		for _, i := range buildTask.Results {
-			ps.Results = append(ps.Results, tektonpipeline.PipelineResult{Name: i.Name, Description: i.Description, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks." + BuildTaskName + ".results." + i.Name + ")"}})
-		}
-	}
+			// TODO: ### How to pass build-settings/tls information to buildah task?
+			//       Note - buildah-oci-ta task has no defined workspace
+			//Workspaces: []tektonpipeline.WorkspacePipelineTaskBinding{
+			//	//{Name: WorkspaceBuildSettings, Workspace: WorkspaceBuildSettings},
+			//	{Name: WorkspaceSource, Workspace: WorkspaceSource},
+			//	//{Name: WorkspaceTls, Workspace: WorkspaceTls},
+			//},
+		}}, ps.Tasks...)
+
+	// Results for https://github.com/konflux-ci/build-definitions/tree/main/task/buildah-oci-ta/0.2
+	// IMAGE_DIGEST
+	// IMAGE_URL
+	ps.Results = append(ps.Results, tektonpipeline.PipelineResult{Name: PipelineResultImage, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks." + BuildTaskName + ".results." + PipelineResultImage + ")"}})
+	ps.Results = append(ps.Results, tektonpipeline.PipelineResult{Name: PipelineResultImageDigest, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: "$(tasks." + BuildTaskName + ".results." + PipelineResultImageDigest + ")"}})
 
 	postBuildTask := tektonpipeline.TaskSpec{
 		Workspaces: []tektonpipeline.WorkspaceDeclaration{{Name: WorkspaceBuildSettings}, {Name: WorkspaceSource, MountPath: WorkspaceMount}, {Name: WorkspaceTls}},
@@ -729,14 +631,6 @@ func secretVariables(jbsConfig *v1alpha1.JBSConfig) []v1.EnvVar {
 	return secretVariables
 }
 
-func createBuildScript(build string) string {
-	ret := "tee $(workspaces." + WorkspaceSource + ".path)/build.sh <<'RHTAPEOF'\n"
-	ret += build
-	ret += "\nRHTAPEOF\n"
-	ret += "chmod +x $(workspaces." + WorkspaceSource + ".path)/build.sh\n"
-	return ret
-}
-
 func createKonfluxScripts(containerfile string, konfluxScript string) string {
 	ret := "mkdir -p $(workspaces." + WorkspaceSource + ".path)/source/.jbs\n"
 	ret += "tee $(workspaces." + WorkspaceSource + ".path)/source/.jbs/Containerfile <<'RHTAPEOF'\n"
@@ -863,7 +757,6 @@ func pipelineBuildCommands(imageId string, db *v1alpha1.DependencyBuild, jbsConf
 	// Setting ORAS_OPTIONS to ensure the archive is compatible with jib (for OCIRepositoryClient).
 	preBuildImageArgs := fmt.Sprintf(`echo "Creating pre-build-image archive"
 export ORAS_OPTIONS="%s --image-spec=v1.0 --artifact-type application/vnd.oci.image.config.v1+json"
-cp $(workspaces.source.path)/build.sh $(workspaces.source.path)/source/.jbs
 create-archive --store %s $(results.%s.path)=$(workspaces.source.path)/source
 `, orasOptions, registryArgsWithDefaults(jbsConfig, preBuildImageTag), PipelineResultPreBuildImageDigest)
 
@@ -882,9 +775,6 @@ create-archive --store %s $(results.%s.path)=$(workspaces.source.path)/source
 		"--scm-uri=" + db.Spec.ScmInfo.SCMURL,
 		"--scm-commit=" + db.Spec.ScmInfo.CommitHash,
 	}
-	if !jbsConfig.Spec.ContainerBuilds {
-		deployArgs = append(deployArgs, "--build-info-path=$(workspaces.source.path)/build-info")
-	}
 
 	konfluxArgs := []string{
 		"deploy-pre-build-source",
@@ -934,25 +824,6 @@ func registryArgsWithDefaults(jbsConfig *v1alpha1.JBSConfig, preBuildImageTag st
 	return registryArgs.String()
 }
 
-func pipelineDeployCommands(jbsConfig *v1alpha1.JBSConfig) []string {
-
-	deployArgs := []string{
-		"deploy",
-		"--directory=$(workspaces.source.path)/artifacts",
-	}
-
-	mavenArgs := make([]string, 0)
-	if jbsConfig.Spec.MavenDeployment.Repository != "" {
-		mavenArgs = append(mavenArgs, "--mvn-repo="+jbsConfig.Spec.MavenDeployment.Repository)
-	}
-	if jbsConfig.Spec.MavenDeployment.Username != "" {
-		mavenArgs = append(mavenArgs, "--mvn-username="+jbsConfig.Spec.MavenDeployment.Username)
-	}
-	deployArgs = append(deployArgs, mavenArgs...)
-
-	return deployArgs
-}
-
 func gitArgs(jbsConfig *v1alpha1.JBSConfig, db *v1alpha1.DependencyBuild) []string {
 	gitArgs := make([]string, 0)
 	if jbsConfig.Spec.GitSourceArchive.Identity != "" {
diff --git a/pkg/reconciler/dependencybuild/dependencybuild.go b/pkg/reconciler/dependencybuild/dependencybuild.go
index 385d15b4c..19b1eeb58 100644
--- a/pkg/reconciler/dependencybuild/dependencybuild.go
+++ b/pkg/reconciler/dependencybuild/dependencybuild.go
@@ -2,8 +2,6 @@ package dependencybuild
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"github.com/google/uuid"
@@ -1382,18 +1380,6 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		return reconcile.Result{}, err
 	}
 	attempt := db.Status.BuildAttempts[len(db.Status.BuildAttempts)-1]
-	gavs := ""
-	shaCalc := sha256.New()
-	imageRegistry := jbsConfig.ImageRegistry()
-	for i := range attempt.Build.Results.Gavs {
-		if i != 0 {
-			gavs += ","
-		}
-		// Same as DigestUtils.sha256Hex(String.format(GAV_FORMAT, groupId, artifactId, version))
-		shaCalc.Reset()
-		shaCalc.Write([]byte(attempt.Build.Results.Gavs[i]))
-		gavs += prependTagToImage(hex.EncodeToString(shaCalc.Sum(nil)), imageRegistry.PrependTag)
-	}
 
 	paramValues := []tektonpipeline.Param{
 		{Name: PipelineResultImage, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: attempt.Build.Results.Image}},
@@ -1411,7 +1397,7 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		Pipeline: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
 		Tasks:    &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout},
 	}
-	pr.Spec.PipelineSpec, err = createDeployPipelineSpec(jbsConfig, buildRequestProcessorImage, gavs)
+	pr.Spec.PipelineSpec, err = createDeployPipelineSpec(jbsConfig, buildRequestProcessorImage)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
diff --git a/pkg/reconciler/dependencybuild/dependencybuild_test.go b/pkg/reconciler/dependencybuild/dependencybuild_test.go
index 76d8b562b..ee367504b 100644
--- a/pkg/reconciler/dependencybuild/dependencybuild_test.go
+++ b/pkg/reconciler/dependencybuild/dependencybuild_test.go
@@ -525,24 +525,25 @@ func TestStateBuilding(t *testing.T) {
 		g.Expect(db.Status.State).Should(Equal(v1alpha1.DependencyBuildStateSubmitBuild))
 		g.Expect(db.Status.BuildAttempts[len(db.Status.BuildAttempts)-1].Recipe.AdditionalMemory).Should(Equal(MemoryIncrement * 2))
 
-		//now verify that the system wide limit kicks in
-		g.Expect(reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Namespace: db.Namespace, Name: db.Name}}))
-		g.Expect(reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Namespace: db.Namespace, Name: db.Name}}))
-
-		pr = getBuildPipelineNo(client, g, 2)
-
-		found := false
-		for _, task := range pr.Spec.PipelineSpec.Tasks {
-			for _, step := range task.TaskSpec.Steps {
-				if step.Name == "build" {
-					//default is 1024 + the 700 limit
-					g.Expect(step.ComputeResources.Requests.Memory().String()).Should(Equal("1724Mi"))
-					found = true
-				}
-			}
-		}
-
-		g.Expect(found).Should(BeTrue())
+		// TODO: KJB-46 - its currently not possible to configure the buildah-oci-ta task with extra memory.
+		////now verify that the system wide limit kicks in
+		//g.Expect(reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Namespace: db.Namespace, Name: db.Name}}))
+		//g.Expect(reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Namespace: db.Namespace, Name: db.Name}}))
+		//
+		//pr = getBuildPipelineNo(client, g, 2)
+		//
+		//found := false
+		//for _, task := range pr.Spec.PipelineSpec.Tasks {
+		//	for _, step := range task.TaskSpec.Steps {
+		//		if step.Name == "build" {
+		//			//default is 1024 + the 700 limit
+		//			g.Expect(step.ComputeResources.Requests.Memory().String()).Should(Equal("1724Mi"))
+		//			found = true
+		//		}
+		//	}
+		//}
+		//
+		//g.Expect(found).Should(BeTrue())
 	})
 	t.Run("Test reconcile building DependencyBuild with contaminants", func(t *testing.T) {
 		g := NewGomegaWithT(t)
diff --git a/pkg/reconciler/dependencybuild/scripts/build-entry.sh b/pkg/reconciler/dependencybuild/scripts/build-entry.sh
index c6fc0e712..30c8b1cf2 100644
--- a/pkg/reconciler/dependencybuild/scripts/build-entry.sh
+++ b/pkg/reconciler/dependencybuild/scripts/build-entry.sh
@@ -39,7 +39,7 @@ echo "PATH:$PATH"
 #fix this when we no longer need to run as root
 export HOME=/root
 
-mkdir -p $(workspaces.source.path)/logs $(workspaces.source.path)/packages $(workspaces.source.path)/build-info
+mkdir -p $(workspaces.source.path)/logs $(workspaces.source.path)/packages
 
 {{INSTALL_PACKAGE_SCRIPT}}
 
diff --git a/pkg/reconciler/dependencybuild/scripts/gradle-build.sh b/pkg/reconciler/dependencybuild/scripts/gradle-build.sh
index 91d57e06f..f708705d1 100644
--- a/pkg/reconciler/dependencybuild/scripts/gradle-build.sh
+++ b/pkg/reconciler/dependencybuild/scripts/gradle-build.sh
@@ -61,7 +61,3 @@ rm -f gradle/verification-metadata.xml
 echo "Running Gradle command with arguments: $@"
 
 gradle -Dmaven.repo.local=$(workspaces.source.path)/artifacts --info --stacktrace "$@" | tee $(workspaces.source.path)/logs/gradle.log
-
-# TODO: Remove for container builds
-cp -r "${GRADLE_USER_HOME}" $(workspaces.source.path)/build-info/.gradle
-cp -r "${HOME}"/.m2/repository/* $(workspaces.source.path)/build-info
diff --git a/pkg/reconciler/dependencybuild/scripts/maven-build.sh b/pkg/reconciler/dependencybuild/scripts/maven-build.sh
index 121291100..f4ca2bdc4 100644
--- a/pkg/reconciler/dependencybuild/scripts/maven-build.sh
+++ b/pkg/reconciler/dependencybuild/scripts/maven-build.sh
@@ -55,6 +55,3 @@ echo "Running Maven command with arguments: $@"
 #we can't use array parameters directly here
 #we pass them in as goals
 mvn -V -B -e -s "$(workspaces.build-settings.path)/settings.xml" -t "$(workspaces.build-settings.path)/toolchains.xml" "$@" "-DaltDeploymentRepository=local::file:$(workspaces.source.path)/artifacts" | tee $(workspaces.source.path)/logs/maven.log
-
-# TODO: Remove for container builds
-cp -r "${HOME}"/.m2/repository/* $(workspaces.source.path)/build-info
diff --git a/pkg/reconciler/dependencybuild/scripts/sbt-build.sh b/pkg/reconciler/dependencybuild/scripts/sbt-build.sh
index af7ca2fa9..cdec09c9d 100644
--- a/pkg/reconciler/dependencybuild/scripts/sbt-build.sh
+++ b/pkg/reconciler/dependencybuild/scripts/sbt-build.sh
@@ -38,6 +38,3 @@ fi
 echo "Running SBT command with arguments: $@"
 
 eval "sbt $@" | tee $(workspaces.source.path)/logs/sbt.log
-
-# TODO: Remove for container builds
-cp -r "${HOME}"/.sbt/* $(workspaces.source.path)/build-info
diff --git a/pkg/reconciler/jbsconfig/jbsconfig.go b/pkg/reconciler/jbsconfig/jbsconfig.go
index 1ca2040ed..314c7ab81 100644
--- a/pkg/reconciler/jbsconfig/jbsconfig.go
+++ b/pkg/reconciler/jbsconfig/jbsconfig.go
@@ -74,10 +74,6 @@ func (r *ReconcilerJBSConfig) Reconcile(ctx context.Context, request reconcile.R
 	}
 	log.Info("reconciling JBSConfig")
 
-	// TODO: ### Should we add some sanity checking i.e. if ContainerBuilds are enabled, we need GIT_DEPLOY_TOKEN
-	//      i.e. source archiving in DeployPreBuildSourceCommand
-	log.Info(fmt.Sprintf("### JBSConfig containerBuilds %#v \n", jbsConfig.Spec.ContainerBuilds))
-
 	//TODO do we eventually want to allow more than one JBSConfig per namespace?
 	if jbsConfig.Name == v1alpha1.JBSConfigName {
 		systemConfig := v1alpha1.SystemConfig{}