diff --git a/apps/distcc/Dockerfile b/apps/distcc/Dockerfile
index 86ce0f1..36706a5 100644
--- a/apps/distcc/Dockerfile
+++ b/apps/distcc/Dockerfile
@@ -1,19 +1,16 @@
-FROM debian:buster-slim
-
-RUN apt-get update && \
-  apt-get install -y \
-    multiarch-support \
-    dpkg-dev \
-    distcc ccache \
-    build-essential \
-    gcc \
-    cpp \
-    g++ \
-    clang \
-    llvm && \
-    apt-get clean -y && \
-    rm -rf /var/lib/apt/lists/*
+FROM debian:stable-slim
 
+RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
+	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \
+	apt-get update && \
+  	apt-get install -y \
+    gcc-arm-linux-gnueabihf gcc-arm-none-eabi gcc-aarch64-linux-gnu \
+    multiarch-support dpkg-dev distcc ccache \
+    build-essential gcc cpp g++ clang llvm && \
+	apt-get clean -y && \ 
+	rm -rf /var/lib/apt/lists/* && \
+	rm -rf /var/cache/apt/*
+	
 # Op port
 EXPOSE 3632
 # Stats port
diff --git a/apps/distcc/distcc-deployment.yaml b/apps/distcc/distcc-deployment.yaml
index be002ff..bf27b50 100644
--- a/apps/distcc/distcc-deployment.yaml
+++ b/apps/distcc/distcc-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app: distcc
-    release: buster
+    release: stable
   name: distcc
   namespace: default
 spec:
@@ -17,11 +17,11 @@ spec:
     metadata:
       labels:
         app: distcc
-        release: buster
+        release: stable
     spec:
       containers:
       - name: distcc
-        image: docker-registry.lan/distcc:aarch64
+        image: cr.lan/distcc:aarch64
         imagePullPolicy: Always
 #env:
 #- name: OPTIONS
@@ -61,7 +61,7 @@ kind: Service
 metadata:
   labels:
     app: distcc
-    release: buster
+    release: stable
   namespace: default
   name: distcc
 spec:
diff --git a/apps/distcc/tekton-image-build.yaml b/apps/distcc/tekton-image-build.yaml
new file mode 100644
index 0000000..f4372cd
--- /dev/null
+++ b/apps/distcc/tekton-image-build.yaml
@@ -0,0 +1,76 @@
+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-distcc
+spec:
+  type: image
+  params:
+    - name: url
+      value: cr.lan/distcc
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: build-distcc
+spec:
+  params:
+    - name: pathToDockerFile
+      type: string
+      default: $(resources.inputs.source.path)/apps/distcc/Dockerfile
+    - name: pathToContext
+      type: string
+      default: $(resources.inputs.source.path)/apps/distcc
+  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-distcc-taskrun
+spec:
+  #serviceAccountName: dockerhub-service
+  taskRef:
+    name: build-distcc
+  params:
+    - name: pathToDockerFile
+      value: Dockerfile
+  resources:
+    inputs:
+      - name: source
+        resourceRef:
+          name: chaos-kubernetes-git
+    outputs:
+      - name: builtImage
+        resourceRef:
+          name: img-distcc
+          
+          
\ No newline at end of file