diff --git a/packages.nix b/packages.nix
index 2138447..d87f4c1 100644
--- a/packages.nix
+++ b/packages.nix
@@ -8,6 +8,8 @@ let
     "--ignore-gpu-blocklist"
     "--enable-gpu-rasterization"
     "--enable-zero-copy"
+    "--force-device-scale-factor=1.0"
+    "--use-gl=desktop"
   ];
   nixGLWrap = import ./utils/nixGLWrap.nix { inherit pkgs lib; };
 in {
@@ -50,11 +52,6 @@ in {
         (builtins.readFile ./scripts/ssh-fix-permissions.sh))
       (pkgs.writeShellScriptBin "yt-dlp-audio"
         (builtins.readFile ./scripts/yt-dlp-audio.sh))
-      (pkgs.writeShellScriptBin "craft" ((pkgs.fetchFromGitHub {
-        owner = "codemonauts";
-        repo = "docker-craft-cms-dev-env";
-        rev = "5053d61654bc720fd61e011642e925a99d81baa0";
-        hash = "sha256-VNL/cyECDx0FSn2xMHMQDbJ3d0y7SEKPZ2EzotQy/PA=";
-      }) + /bin/craft))
+      (callPackage pkgs/docker-craft-cms-dev-env.nix { inherit lib; })
     ];
 }
diff --git a/pkgs/docker-craft-cms-dev-env.nix b/pkgs/docker-craft-cms-dev-env.nix
new file mode 100644
index 0000000..0717645
--- /dev/null
+++ b/pkgs/docker-craft-cms-dev-env.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "docker-craft-cms-dev-env";
+  version = "unstable-2023-04-14";
+
+  src = fetchFromGitHub {
+    owner = "codemonauts";
+    repo = "docker-craft-cms-dev-env";
+    rev = "5053d61654bc720fd61e011642e925a99d81baa0";
+    hash = "sha256-VNL/cyECDx0FSn2xMHMQDbJ3d0y7SEKPZ2EzotQy/PA=";
+  };
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp -r $src/bin/craft $out/bin/craft
+  '';
+
+  meta = with lib; {
+    description = "Docker image for local development of sites based on Craft CMS";
+    homepage = "https://github.com/codemonauts/docker-craft-cms-dev-env";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}