diff --git a/README.md b/README.md
index 7c15537..8a28cad 100644
--- a/README.md
+++ b/README.md
@@ -27,21 +27,28 @@
     "nationality": "Alsace, France",
     "interests": ["Developer Full Stack", "Open-Source Enthusiast"],
     "skills": {
-        "programmingLanguages": [
-            "JavaScript/TypeScript",
-            "Python",
-            "C/C++",
-            "PHP"
+        "software-development": [
+            "TypeScript",
+            "React.js (+ Next.js)",
+            "Tailwind CSS",
+            "Node.js",
+            "tRPC/oRPC",
+            "PostgreSQL"
         ],
-        "frontend": ["HTML/CSS", "Tailwind CSS", "React.js/Next.js"],
-        "backend": ["Laravel", "Node.js", "Fastify", "PostgreSQL"],
-        "tools": [
+        "sys-admin": [
+            "Docker",
+            "Proxmox",
+            "Caddy",
+            "GitHub Actions",
+            "GitLab CI/CD"
+        ],
+        "software-tools": [
             "GNU/Linux",
             "Arch Linux",
             "Visual Studio Code",
-            "Git",
-            "Docker"
-        ]
+            "Git"
+        ],
+        "systems-programming": ["C/C++", "Rust", "Go"]
     }
 }
 ```
diff --git a/apps/website/public/images/skills/Caddy.webp b/apps/website/public/images/skills/Caddy.webp
new file mode 100644
index 0000000..98eb39d
Binary files /dev/null and b/apps/website/public/images/skills/Caddy.webp differ
diff --git a/apps/website/public/images/skills/GitHub-dark.webp b/apps/website/public/images/skills/GitHub-dark.webp
new file mode 100644
index 0000000..c1186d6
Binary files /dev/null and b/apps/website/public/images/skills/GitHub-dark.webp differ
diff --git a/apps/website/public/images/skills/GitHub-light.webp b/apps/website/public/images/skills/GitHub-light.webp
new file mode 100644
index 0000000..548b0f2
Binary files /dev/null and b/apps/website/public/images/skills/GitHub-light.webp differ
diff --git a/apps/website/public/images/skills/GitLab.webp b/apps/website/public/images/skills/GitLab.webp
new file mode 100644
index 0000000..3520ddd
Binary files /dev/null and b/apps/website/public/images/skills/GitLab.webp differ
diff --git a/apps/website/public/images/skills/Go.webp b/apps/website/public/images/skills/Go.webp
new file mode 100644
index 0000000..fd2bda9
Binary files /dev/null and b/apps/website/public/images/skills/Go.webp differ
diff --git a/apps/website/public/images/skills/Proxmox-dark.webp b/apps/website/public/images/skills/Proxmox-dark.webp
new file mode 100644
index 0000000..1974d30
Binary files /dev/null and b/apps/website/public/images/skills/Proxmox-dark.webp differ
diff --git a/apps/website/public/images/skills/Proxmox-light.webp b/apps/website/public/images/skills/Proxmox-light.webp
new file mode 100644
index 0000000..c574d32
Binary files /dev/null and b/apps/website/public/images/skills/Proxmox-light.webp differ
diff --git a/apps/website/public/images/skills/Rust.webp b/apps/website/public/images/skills/Rust.webp
new file mode 100644
index 0000000..4d94b80
Binary files /dev/null and b/apps/website/public/images/skills/Rust.webp differ
diff --git a/apps/website/public/images/skills/tRPC.webp b/apps/website/public/images/skills/tRPC.webp
new file mode 100644
index 0000000..8fbcb60
Binary files /dev/null and b/apps/website/public/images/skills/tRPC.webp differ
diff --git a/packages/i18n/src/translations/en-US.json b/packages/i18n/src/translations/en-US.json
index 618264c..9770752 100644
--- a/packages/i18n/src/translations/en-US.json
+++ b/packages/i18n/src/translations/en-US.json
@@ -155,6 +155,10 @@
       "title": "Projects"
     },
     "skills": {
+      "software-development": "Software Development",
+      "sys-admin": "SysAdmin",
+      "systems-programming": "Systems Programming",
+
       "backend": "Backend",
       "driving-license": "Driving license",
       "frontend": "Frontend",
diff --git a/packages/i18n/src/translations/fr-FR.json b/packages/i18n/src/translations/fr-FR.json
index 48849ee..29190e7 100644
--- a/packages/i18n/src/translations/fr-FR.json
+++ b/packages/i18n/src/translations/fr-FR.json
@@ -155,6 +155,10 @@
       "title": "Projets"
     },
     "skills": {
+      "software-development": "Développement informatique",
+      "sys-admin": "SysAdmin",
+      "systems-programming": "Programmation Système",
+
       "backend": "Backend",
       "driving-license": "Permis B",
       "frontend": "Frontend",
diff --git a/packages/ui/src/Home/Skills/skills.ts b/packages/ui/src/Home/Skills/skills.ts
index 07157e2..a105ef2 100644
--- a/packages/ui/src/Home/Skills/skills.ts
+++ b/packages/ui/src/Home/Skills/skills.ts
@@ -110,29 +110,64 @@ export const SKILLS = {
     link: "https://www.docker.com/",
     image: "/images/skills/Docker.webp",
   },
+  "tRPC/oRPC": {
+    link: "https://trpc.io/",
+    image: "/images/skills/tRPC.webp",
+  },
+  Rust: {
+    link: "https://www.rust-lang.org/",
+    image: "/images/skills/Rust.webp",
+  },
+  Caddy: {
+    link: "https://caddyserver.com/",
+    image: "/images/skills/Caddy.webp",
+  },
+  Proxmox: {
+    link: "https://www.proxmox.com/",
+    image: {
+      light: "/images/skills/Proxmox-light.webp",
+      dark: "/images/skills/Proxmox-dark.webp",
+    },
+  },
+  "GitHub Actions": {
+    link: "https://github.com/features/actions",
+    image: {
+      light: "/images/skills/GitHub-light.webp",
+      dark: "/images/skills/GitHub-dark.webp",
+    },
+  },
+  "GitLab CI/CD": {
+    link: "https://docs.gitlab.com/ci",
+    image: "/images/skills/GitLab.webp",
+  },
+  Go: {
+    link: "https://go.dev/",
+    image: "/images/skills/Go.webp",
+  },
 } as const
 
 export type SkillName = keyof typeof SKILLS
 
 export const SKILL_CATEGORIES = [
-  "programming-languages",
-  "frontend",
-  "backend",
+  "software-development",
+  "sys-admin",
+  "systems-programming",
   "software-tools",
 ] as const
 export type SkillCategory = (typeof SKILL_CATEGORIES)[number]
 
 export const SKILL_NAMES_BY_CATEGORY = {
-  "programming-languages": ["TypeScript", "Python", "C/C++", "PHP"],
-  frontend: ["HTML", "CSS", "Tailwind CSS", "React.js (+ Next.js)"],
-  backend: ["Laravel", "Node.js", "Fastify", "PostgreSQL"],
-  "software-tools": [
-    "GNU/Linux",
-    "Arch Linux",
-    "Visual Studio Code",
-    "Git",
-    "Docker",
+  "software-development": [
+    "TypeScript",
+    "React.js (+ Next.js)",
+    "Tailwind CSS",
+    "Node.js",
+    "tRPC/oRPC",
+    "PostgreSQL",
   ],
+  "sys-admin": ["Docker", "Proxmox", "Caddy", "GitHub Actions", "GitLab CI/CD"],
+  "software-tools": ["GNU/Linux", "Arch Linux", "Visual Studio Code", "Git"],
+  "systems-programming": ["C/C++", "Rust", "Go"],
 } as const satisfies {
   [key in SkillCategory]: SkillName[]
 }