diff --git a/nixy/configuration.nix b/nixy/configuration.nix
index 1d63fa1..00f90e4 100644
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,11 +1,10 @@
-{
-  config,
-  nix-xilinx,
-  nvim,
-  pkgs,
-  system,
-  zremap,
-  ...
+{ config
+, nix-xilinx
+, nvim
+, pkgs
+, system
+, zremap
+, ...
 }:
 let
   USER = "akill";
@@ -255,6 +254,14 @@ in
   # List services that you want to enable:
   systemd = {
     services = {
+
+      # Fix issue where systemd-vconsole-setup failes to find keymap
+      systemd-vconsole-setup = {
+        unitConfig = {
+          After = "local-fs.target";
+        };
+      };
+
       "zremap@" = {
         enable = true;
         restartIfChanged = true;