diff --git a/app/src/main/java/io/xpipe/app/process/ShellDialects.java b/app/src/main/java/io/xpipe/app/process/ShellDialects.java
index fdd27c1ae..b8bfb30cd 100644
--- a/app/src/main/java/io/xpipe/app/process/ShellDialects.java
+++ b/app/src/main/java/io/xpipe/app/process/ShellDialects.java
@@ -26,7 +26,9 @@ public class ShellDialects {
     public static ShellDialect XONSH;
 
     public static ShellDialect NO_INTERACTION;
-    public static ShellDialect CISCO;
+    public static ShellDialect CISCO_IOS;
+    public static ShellDialect CISCO_IOS_XE;
+    public static ShellDialect CISCO_NXOS;
     public static ShellDialect MIKROTIK;
     public static ShellDialect PALO_ALTO;
     public static ShellDialect RBASH;
@@ -95,7 +97,9 @@ public class ShellDialects {
             NUSHELL = byId("nushell");
             XONSH = byId("xonsh");
             NO_INTERACTION = byId("noInteraction");
-            CISCO = byId("cisco");
+            CISCO_IOS = byId("ciscoIos");
+            CISCO_IOS_XE = byId("ciscoIosXe");
+            CISCO_NXOS = byId("ciscoNxOs");
             MIKROTIK = byId("mikrotik");
             PALO_ALTO = byId("paloAlto");
             RBASH = byId("rbash");
diff --git a/dist/changelog/21.5.md b/dist/changelog/21.5.md
new file mode 100644
index 000000000..9291e9b03
--- /dev/null
+++ b/dist/changelog/21.5.md
@@ -0,0 +1,14 @@
+## Cisco device support
+
+This release adds support for Cisco NX-OS devices:
+
+![NX-OS](https://xpipe.io/assets/images/BlogPage/nxos.png)
+
+The existing cisco integration has been reworked, meaning that you will have to delete and re-add the network port entries again.
+
+This completes the integration for Cisco network devices. If there is demand, support for other network device vendors can be added as well.
+
+## Fixes
+
+- Fix system detection being broken for shells with allocated tty/pty
+- Fix identities being moved to other categories when edited