diff --git a/packages/system/immucore/collection.yaml b/packages/system/immucore/collection.yaml
index 6c40d6a96..5198b13db 100644
--- a/packages/system/immucore/collection.yaml
+++ b/packages/system/immucore/collection.yaml
@@ -21,25 +21,3 @@ packages:
       - https://github.com/kairos-io/immucore
     license: "Apache License v2"
     description: "The Kairos immutability management interface"
-  - name: "immucore"
-    category: "system"
-    version: "0.1.17-2"
-    labels:
-      github.repo: "immucore"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/immucore
-    license: "Apache License v2"
-    description: "The Kairos immutability management interface"
-  - name: "immucore"
-    category: "fips"
-    version: "0.1.17-2"
-    labels:
-      github.repo: "immucore"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/immucore
-    license: "Apache License v2"
-    description: "The Kairos immutability management interface"
\ No newline at end of file
diff --git a/packages/system/kairos-agent/collection.yaml b/packages/system/kairos-agent/collection.yaml
index b4b758970..dcca87b04 100644
--- a/packages/system/kairos-agent/collection.yaml
+++ b/packages/system/kairos-agent/collection.yaml
@@ -21,28 +21,6 @@ packages:
       - https://github.com/kairos-io/kairos-agent
     license: "Apache License v2"
     description: "Lifecycle agent for kairos"
-  - name: "kairos-agent"
-    category: "system"
-    version: "2.5.1"
-    labels:
-      github.repo: "kairos-agent"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kairos-agent
-    license: "Apache License v2"
-    description: "Lifecycle agent for kairos"
-  - name: "kairos-agent"
-    category: "fips"
-    version: "2.5.1"
-    labels:
-      github.repo: "kairos-agent"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kairos-agent
-    license: "Apache License v2"
-    description: "Lifecycle agent for kairos"
 # doesnt build so disable for now
 #- name: "kairos-agent"
 #    category: "fips-static"
diff --git a/packages/system/kcrypt-challenger/build.yaml b/packages/system/kcrypt-challenger/build.yaml
index fcf88ea0f..12f484bf7 100644
--- a/packages/system/kcrypt-challenger/build.yaml
+++ b/packages/system/kcrypt-challenger/build.yaml
@@ -10,7 +10,10 @@ requires:
     version: ">=0"
 {{end}}
 prelude:
-  - apt-get update && apt-get install -y gcc libssl-dev
+  - apt-get update && apt-get install -y gcc
+{{if not (or (eq .Values.category "fips") (eq .Values.category "fips-static"))}}
+  - apt-get install -y libssl-dev
+{{ end }}
   - mkdir go/src/github.com/${GITHUB_ORG}/ -p
   - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
 {{ if ne .Values.live "yes" }}
@@ -40,9 +43,7 @@ steps:
 {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}}
   {{ if .Values.arch }}
     {{ if eq .Values.arch "amd64" }}
-    {{ if ne .Values.version "0.6.0+cve1" }}
   - go tool nm /system/discovery/{{ .Values.binary_name }} | grep -i "FIPS_mode"
-    {{ end }}
     {{end}}
   {{end}}
 {{end}}
diff --git a/packages/system/kcrypt-challenger/collection.yaml b/packages/system/kcrypt-challenger/collection.yaml
index 663596b58..b9d413a57 100644
--- a/packages/system/kcrypt-challenger/collection.yaml
+++ b/packages/system/kcrypt-challenger/collection.yaml
@@ -23,30 +23,6 @@ packages:
       - https://github.com/kairos-io/kcrypt-challenger
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt-challenger
-    binary_name: kcrypt-discovery-challenger
-    category: system
-    live: "yes"
-    version: "0.6.0+cve1"
-    labels:
-      github.repo: "kcrypt-challenger"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt-challenger
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt-challenger
-    binary_name: kcrypt-discovery-challenger
-    category: fips
-    live: "yes"
-    version: "0.6.0+cve1"
-    labels:
-      github.repo: "kcrypt-challenger"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt-challenger
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
     #- name: kcrypt-challenger
     #binary_name: kcrypt-discovery-challenger
     #ldflags: "-linkmode external -extldflags -static"
diff --git a/packages/system/kcrypt/build.yaml b/packages/system/kcrypt/build.yaml
index 9d9217191..3564a6bca 100644
--- a/packages/system/kcrypt/build.yaml
+++ b/packages/system/kcrypt/build.yaml
@@ -35,9 +35,7 @@ steps:
 {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}}
   {{ if .Values.arch }}
     {{ if eq .Values.arch "amd64" }}
-    {{ if ne .Values.version "0.7.0+cve1" }}
   - go tool nm /usr/bin/{{.Values.name}} | grep -i "FIPS_mode"
-    {{ end }}
     {{end}}
   {{end}}
 {{end}}
diff --git a/packages/system/kcrypt/collection.yaml b/packages/system/kcrypt/collection.yaml
index 1324a853e..7ae9a3756 100644
--- a/packages/system/kcrypt/collection.yaml
+++ b/packages/system/kcrypt/collection.yaml
@@ -21,29 +21,6 @@ packages:
       - https://github.com/kairos-io/kcrypt
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt
-    category: system
-    version: "0.7.0+cve1"
-    labels:
-      github.repo: "kcrypt"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
-  - name: kcrypt
-    category: fips
-    version: "0.7.0+cve1"
-    labels:
-      github.repo: "kcrypt"
-      autobump.revdeps: "true"
-      github.owner: "kairos-io"
-    uri:
-      - https://github.com/kairos-io/kcrypt
-    license: "Apache License v2"
-    description: "Cloud native guardian for persistent data in the edge"
-
     #- name: kcrypt
     #ldflags: "-linkmode external -extldflags -static"
     #category: fips-static