diff --git a/home_resources/.bashrc b/home_resources/.bashrc
index e1000a0..1a926a9 100644
--- a/home_resources/.bashrc
+++ b/home_resources/.bashrc
@@ -118,6 +118,9 @@ export PATH="/usr/sbin:${PATH}"
 
 export EDITOR=vim
 
+# To fix weird terminal behaviour when in SSH
+export TERM=vt100
+
 neofetch
 # List all open ports and their associated programs
 ss -tulpn
diff --git a/server-firewall-setup.yml b/server-firewall-setup.yml
index d0d9a6f..8e644fd 100644
--- a/server-firewall-setup.yml
+++ b/server-firewall-setup.yml
@@ -100,6 +100,18 @@
         protocol: icmp
         jump: ACCEPT
 
+    # USB/IP Configuration
+    - name: Accept inbound/outbound USBIP only on internal network
+      ansible.builtin.iptables:
+        chain: "{{ item }}"
+        protocol: tcp
+        source: 192.168.1.0/24
+        destination_port: 3240
+        jump: ACCEPT
+      loop:
+        - INPUT
+        - OUTPUT
+
     # SMB/SAMBA Service
     - name: Accept inbound SMB/NETBIOS SSN/NETBIOS DGM/NETBIOS NS only from internal network
       ansible.builtin.iptables:
diff --git a/server-setup.yml b/server-setup.yml
index 65f129d..6df5c0c 100644
--- a/server-setup.yml
+++ b/server-setup.yml
@@ -31,6 +31,7 @@
         # - exfat-fuse
         # - exfat-utils
       - exfatprogs
+      - usbip
 
       # VPN Client to access Proxy Server (Primarily for cockpit)
       - wireguard
@@ -71,6 +72,13 @@
       loop:
         - { key: "ANSIBLE_CONFIG", value: "{{ ansibleconf_directory }}/ansible.cfg" }
 
+    - name: Ensure vhci_hcd kernel module is loaded and persistent on reboot (For USBIP client support)
+      become: yes
+      community.general.modprobe:
+        name: vhci_hcd
+        state: present
+        persistent: present
+
     # System Setup
     - name: Ensure .bashrc is updated
       template: