diff --git a/.gitignore b/.gitignore
index 8ae099776..723810e1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+spack.lock
 .idea
 justfile
 src/.cache
@@ -10,6 +11,7 @@ lib/
 ._*
 *.o
 *.pyc
+__pycache__
 .deps
 wiki
 .sconsign.dblite
diff --git a/spack-env/recipes/packages/criterion-git/package.py b/spack-env/recipes/packages/criterion-git/package.py
new file mode 100644
index 000000000..e17cb99be
--- /dev/null
+++ b/spack-env/recipes/packages/criterion-git/package.py
@@ -0,0 +1,40 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.build_systems.meson import MesonBuilder
+
+from spack import *
+
+MesonBuilder._std_args_orig = MesonBuilder.std_args
+
+
+def meson_args(pkg):
+    args = MesonBuilder._std_args_orig(pkg)
+    args.remove("-Dwrap_mode=nodownload")
+    args.append("-Dwrap_mode=default")
+    return args
+
+MesonBuilder.std_args = meson_args
+
+
+class CriterionGit(MesonPackage):
+    """A dead-simple, yet extensible, C and C++ unit testing framework."""
+
+    homepage = "https://github.com/Snaipe/Criterion/tree/master"
+    git = "git@github.com:Snaipe/Criterion.git"
+
+    maintainers = [
+        "smutch",
+    ]
+
+    version("2.4.2", tag="v2.4.2", submodules=True)
+
+    # depends_on("gettext")
+    depends_on("meson@0.55.0:", type="build")
+    depends_on("ninja", type="build")
+    depends_on("cmake", type="build")
+    depends_on("pkg-config", type="build")
+    depends_on("libffi", type="build")
+    depends_on("libgit2", type="build")
diff --git a/spack-env/recipes/repo.yaml b/spack-env/recipes/repo.yaml
new file mode 100644
index 000000000..8e2573c36
--- /dev/null
+++ b/spack-env/recipes/repo.yaml
@@ -0,0 +1,2 @@
+repo:
+  namespace: 'meraxes-repo'
diff --git a/spack.yaml b/spack-env/spack.yaml
similarity index 58%
rename from spack.yaml
rename to spack-env/spack.yaml
index 7c5e8027c..87aec5f3e 100644
--- a/spack.yaml
+++ b/spack-env/spack.yaml
@@ -5,13 +5,22 @@
 spack:
   # add package specs to the `specs` list
   specs: [hdf5+hl+mpi^mpich, fftw+mpi+openmp^mpich, gsl, cmake, criterion-git]
-  view: true
-  packages:
-    all:
-      compiler: [gcc]
+  view: True
   modules:
     prefix_inspections:
       include:
       - CPATH
   repos:
-  - ../spack-repo
+  - recipes
+  mirrors:
+    develop: https://binaries.spack.io/develop
+  packages:
+    m4:
+      buildable: True
+      externals: []
+    autoconf:
+      buildable: True
+      externals: []
+    libtool:
+      buildable: True
+      externals: []
diff --git a/spack-repo/packages/criterion-git/package.py b/spack-repo/packages/criterion-git/package.py
deleted file mode 100644
index e637e6b25..000000000
--- a/spack-repo/packages/criterion-git/package.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack import *
-
-
-class CriterionGit(CMakePackage):
-    """A dead-simple, yet extensible, C and C++ unit testing framework."""
-
-    homepage = "https://github.com/Snaipe/Criterion/tree/master"
-    git      = "git@github.com:Snaipe/Criterion.git"
-
-    maintainers = ['smutch',]
-
-    version('2.3.3', tag='v2.3.3', submodules=True)
-
-    depends_on('gettext')
diff --git a/spack-repo/repo.yaml b/spack-repo/repo.yaml
deleted file mode 100644
index 082344ab5..000000000
--- a/spack-repo/repo.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-repo:
-  namespace: 'spack-repo'
diff --git a/src/bootstrap-dev.sh b/src/bootstrap-dev.sh
deleted file mode 100755
index c04581744..000000000
--- a/src/bootstrap-dev.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-echo "If you haven't already, please be sure and run"
-echo "  spack compiler find && spack external find"
-echo
-
-while true; do
-    read -p "Do you wish to setup the spack env with all requirements? [Y/n] " yn
-    case $yn in
-        [Yy]* ) break;;
-        ''    ) break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
-
-cd ..
-spack env create -d ./spack-env spack.yaml
-eval `spack env activate --sh ./spack-env`
-spack concretize
-spack install