diff --git a/README.md b/README.md
index 70f0e400e..df92901f5 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ projects branches.
 As an example, the `containerized-tests` Jenkins job consists out of the
 following files:
 
-- `containerized-tests.yaml` is a [Jenkins Job Builder](jjb) configuration
+- `jobs/containerized-tests.yaml` is a [Jenkins Job Builder](jjb) configuration
   that describes the events when the job should get run and fetches the
   `.groovy` file from the git repository/branch
 - `containerized-tests.groovy` is the [Jenkins Pipeline](pipeline) that
diff --git a/deploy/Makefile b/deploy/Makefile
index 52bc178f4..7df588e3f 100644
--- a/deploy/Makefile
+++ b/deploy/Makefile
@@ -2,7 +2,7 @@ WORKDIR ?= $(CURDIR)/../
 OUTPUT ?= $(WORKDIR)/_output/
 
 test:
-	jenkins-jobs test -o $(OUTPUT) $(WORKDIR)
+	jenkins-jobs test -o $(OUTPUT) $(WORKDIR)/jobs
 
 deploy:
-	jenkins-jobs update $(WORKDIR)
+	jenkins-jobs update $(WORKDIR)/jobs
diff --git a/ci-job-validation.yaml b/jobs/ci-job-validation.yaml
similarity index 100%
rename from ci-job-validation.yaml
rename to jobs/ci-job-validation.yaml
diff --git a/containerized-tests.yaml b/jobs/containerized-tests.yaml
similarity index 100%
rename from containerized-tests.yaml
rename to jobs/containerized-tests.yaml
diff --git a/jjb-deploy.yaml b/jobs/jjb-deploy.yaml
similarity index 100%
rename from jjb-deploy.yaml
rename to jobs/jjb-deploy.yaml
diff --git a/jjb-validate.yaml b/jobs/jjb-validate.yaml
similarity index 100%
rename from jjb-validate.yaml
rename to jobs/jjb-validate.yaml