diff --git a/apps/apt-cacher-ng/tekton-image-build.yaml b/apps/apt-cacher-ng/tekton-image-build.yaml
deleted file mode 100644
index 330c60f..0000000
--- a/apps/apt-cacher-ng/tekton-image-build.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
-metadata:
-  name: chaos-kubernetes-git
-spec:
-  type: git
-  params:
-    - name: revision
-      value: master
-    - name: url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: submodules
-      value: "false"
----
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
-metadata:
-  name: img-apt-cacher-ng
-spec:
-  type: image
-  params:
-    - name: url
-      value: cr.lan/apt-cacher-ng
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: build-apt-cacher-ng
-spec:
-  params:
-    - name: pathToDockerFile
-      type: string
-      default: $(resources.inputs.source.path)/apps/apt-cacher-ng/Dockerfile
-    - name: pathToContext
-      type: string
-      default: $(resources.inputs.source.path)/apps/apt-cacher-ng
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: builtImage
-        type: image
-  steps:
-    - name: build-and-push
-      image: gcr.io/kaniko-project/executor:arm64
-      command:
-        - /kaniko/executor
-      args:
-        - --dockerfile=$(params.pathToDockerFile)
-        - --destination=$(resources.outputs.builtImage.url)
-        - --context=$(params.pathToContext)
-        - --skip-tls-verify
----
-apiVersion: tekton.dev/v1beta1
-kind: TaskRun
-metadata:
-  name: img-apt-cacher-ng
-spec:
-  #serviceAccountName: dockerhub-service
-  taskRef:
-    name: build-apt-cacher-ng
-  params:
-    - name: pathToDockerFile
-      value: Dockerfile
-  resources:
-    inputs:
-      - name: source
-        resourceRef:
-          name: chaos-kubernetes-git
-    outputs:
-      - name: builtImage
-        resourceRef:
-          name: img-apt-cacher-ng
-          
-          
\ No newline at end of file
diff --git a/apps/apt-cacher-ng/tekton.yaml b/apps/apt-cacher-ng/tekton.yaml
new file mode 100644
index 0000000..7261146
--- /dev/null
+++ b/apps/apt-cacher-ng/tekton.yaml
@@ -0,0 +1,23 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: img-apt-cacher-ng
+spec:
+  pipelineRef:
+    name: kaniko-pipeline
+  params:
+    - name: git-url
+      value: http://git-ui.lan/chaos/kubernetes.git
+    - name: git-revision
+      value: master
+    - name: path-to-image-context
+      value: apps/apt-cacher-ng
+    - name: path-to-dockerfile
+      value: apps/apt-cacher-ng/Dockerfile
+    - name: image-name
+      value: cr.lan/apt-cacher-ng
+  workspaces:
+      - name: git-source
+        persistentVolumeClaim:
+          claimName: tektoncd-workspaces
+        subPath: tekton/apt-cacher-ng
\ No newline at end of file
diff --git a/apps/apt-cacher-ng/test-deployment.yaml b/apps/apt-cacher-ng/test-deployment.yaml
deleted file mode 100644
index 576734d..0000000
--- a/apps/apt-cacher-ng/test-deployment.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: apt-cacher-ng-test
-  namespace: test
-  labels:
-    app: apt-cacher-ng-test
-spec:
-  replicas: 1
-  selector:
-      matchLabels:
-          app: apt-cacher-ng-test
-  strategy:
-      type: Recreate
-  template:
-    metadata:
-        labels:
-            app: apt-cacher-ng-test
-    spec:
-      containers:
-        - name: apt-cacher-ng-test
-          image: docker-registry.lan/apt-cacher-ng:arm64
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 3142
-              protocol: TCP
-          volumeMounts:
-            - mountPath: /var/cache/apt-cacher-ng
-              name: data
-          resources:
-             requests: 
-                memory: 64Mi
-                cpu: 50m
-             limits:
-                memory: 128Mi
-                cpu: 100m
-      volumes:
-        - name: data
-          persistentVolumeClaim:
-              claimName: apt-cacher-volume-test
-              #---
-              #apiVersion: v1
-              #kind: Service 
-              #metadata:
-              #  name: apt-cacher-ng
-              #  labels:
-              #    app: apt-cacher-ng
-              #spec:
-              #  type: LoadBalancer
-              #  loadBalancerIP: 172.23.255.1
-              #  ports:
-              #    - name: apt-cacher-ng
-              #      port: 3142
-              #      targetPort: 3142
-              #      protocol: TCP
-              #  selector:
-              #    app: apt-cacher-ng
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: apt-cacher-volume-test 
-  namespace: test
-  #annotations:
-  #  volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
-spec:
-  storageClassName: csi-s3-slow
-    #storageClassName: fast
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 40Gi
diff --git a/apps/curl/Dockerfile b/apps/curl/Dockerfile
index 7a3e955..e437ed8 100644
--- a/apps/curl/Dockerfile
+++ b/apps/curl/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stable-slim
+FROM cr.lan/debian-stable
 
 RUN apt-get update && apt-get install -y \
 	curl procps && \
diff --git a/apps/curl/tekton.yaml b/apps/curl/tekton.yaml
new file mode 100644
index 0000000..abb3012
--- /dev/null
+++ b/apps/curl/tekton.yaml
@@ -0,0 +1,23 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: img-curl
+spec:
+  pipelineRef:
+    name: kaniko-pipeline
+  params:
+    - name: git-url
+      value: http://git-ui.lan/chaos/kubernetes.git
+    - name: git-revision
+      value: master
+    - name: path-to-image-context
+      value: apps/curl
+    - name: path-to-dockerfile
+      value: apps/curl/Dockerfile
+    - name: image-name
+      value: cr.lan/curl
+  workspaces:
+      - name: git-source
+        persistentVolumeClaim:
+          claimName: tektoncd-workspaces
+        subPath: tekton/curl
\ No newline at end of file