diff --git a/software/apache.yml b/software/apache-http-server.yml
similarity index 100%
rename from software/apache.yml
rename to software/apache-http-server.yml
diff --git a/software/bifroest.yml b/software/bifroest.yml
deleted file mode 100644
index fd492cfd9d..0000000000
--- a/software/bifroest.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Engity's Bifröst
-website_url: https://bifroest.engity.org/
-description: Highly customizable SSH server with several ways to authorize a user and options where and how to execute a user's session.
-licenses:
-  - Apache-2.0
-platforms:
-  - Go
-  - Docker
-tags:
-  - Remote Access
-source_code_url: https://github.com/engity-com/bifroest
diff --git a/software/clustercontrol.yml b/software/cluster-control.yml
similarity index 100%
rename from software/clustercontrol.yml
rename to software/cluster-control.yml
diff --git a/software/not-three.yml b/software/not-three.yml
deleted file mode 100644
index acf98e4de4..0000000000
--- a/software/not-three.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "not-th.re"
-website_url: "https://not-th.re"
-source_code_url: "https://github.com/not-three/main"
-description: "Simple paste sharing platform, with client side encryption, featuring the monaco browser-based code editor."
-licenses:
-  - NPOSL-3.0
-platforms:
-  - Nodejs
-  - Docker
-tags:
-  - Pastebins
-demo_url: "https://not-th.re"
diff --git a/software/plexripper b/software/plexripper
deleted file mode 100644
index 6cc5b97f54..0000000000
--- a/software/plexripper
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "PlexRipper"
-website_url: "https://www.plexripper.rocks/"
-source_code_url: "https://github.com/PlexRipper/PlexRipper"
-description: "A cross-platform Plex media downloader that seamlessly adds media from other Plex servers to your own."
-licenses:
-  - GPL-3.0
-platforms:
-  - Docker
-tags:
-  - Automation
-depends_3rdparty: true
diff --git a/software/scribblers.yml b/software/scribblers.yml
deleted file mode 100644
index 748bf4d565..0000000000
--- a/software/scribblers.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: "Scribble.rs"
-website_url: "https://github.com/scribble-rs/scribble.rs"
-source_code_url: "https://github.com/scribble-rs/scribble.rs"
-description: "A web-based pictionary game."
-licenses:
-  - BSD-3-Clause
-platforms:
-  - Go
-  - Docker
-tags:
-  - Games
-demo_url: "https://scribblers.fly.dev"
diff --git a/software/whattocook.yaml b/software/whattocook.yaml
deleted file mode 100644
index e6f84b5366..0000000000
--- a/software/whattocook.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: What To Cook?
-website_url: https://github.com/kassner/whattocook
-description: Get a recipe to cook today, based on the ingredients you have at home.
-licenses:
-  - AGPL-3.0
-platforms:
-  - Docker
-tags:
-  - Recipe Management
-source_code_url: https://github.com/kassner/whattocook