diff --git a/chapter-qkd/Makefile b/chapter-qkd/Makefile
index bf3eba5..a97188e 100644
--- a/chapter-qkd/Makefile
+++ b/chapter-qkd/Makefile
@@ -6,7 +6,7 @@ SHELL := bash
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_STRING := $(shell git describe --tags --long --dirty)
+VERSION_STRING := $(shell git describe --always --tags --long)
 
 all: chapter.pdf
 
@@ -24,7 +24,7 @@ version.tex: chapter.tex
 
 .PHONY: update-figures
 update-figures:
-	make -C figures
+	@python figures/update_figures.py figures
 
 .PHONY: clean
 clean:
diff --git a/chapter-qkd/chapter.pdf b/chapter-qkd/chapter.pdf
deleted file mode 100644
index 443d8df..0000000
Binary files a/chapter-qkd/chapter.pdf and /dev/null differ
diff --git a/chapter-qkd/chapter.tex b/chapter-qkd/chapter.tex
index 53fa9f9..97521ae 100644
--- a/chapter-qkd/chapter.tex
+++ b/chapter-qkd/chapter.tex
@@ -10,6 +10,7 @@
 \usepackage{wasysym}
 \usepackage{extdash}
 \usepackage{amsthm}
+\usepackage{mwe}
 \usepackage{tabularx}
 \usepackage{multirow}
 \usepackage{multicol}
@@ -32,6 +33,7 @@
 \usetikzlibrary{calc}
 \usepackage{epstopdf}
 \usepackage{pdfpages}
+\usepackage{etoolbox}
 \usepackage{minitoc}
 \usepackage{minted} % pygmentized source code
 %\usepackage[pdftex]{graphicx,color}
@@ -119,6 +121,28 @@
     }
 }
 
+% https://tex.stackexchange.com/questions/30720/footnote-without-a-marker
+\newcommand\blfootnote[1]{%
+  \begingroup
+  \renewcommand\thefootnote{}\footnote{#1}%
+  \addtocounter{footnote}{-1}%
+  \endgroup
+}
+
+\newcommand{\figurepath}{figures}
+\graphicspath{{\figurepath}}
+\newcommand{\figureattrib}[1]{
+    \listxadd{\figureattribcache}{Resource location:}
+        %\href{\input{\figurepath/#1.git_url}}{
+        %    git repo \input{\figurepath/#1.git_remote}
+        %    path \input{\figurepath/#1.git_path}
+        %    rev \input{\figurepath/#1.git_rev}}
+}
+\newcommand{\flushfigureattrib}{
+    \forlistloop{\blfootnote}{\figureattribcache}
+    \undef\figureattribcache
+}
+
 \hyphenation{a-me-na-ble}
 
 \begin{document}
@@ -580,7 +604,17 @@ provides a combined power and multi-fiber passthrough that is sufficient for QKD
 
 \subsection{Multi-fiber passthrough with active secondary mesh}
 
+\begin{figure}
+    \subcaptionbox{}{\includegraphics[width=\textwidth]{render_side_1.png}}
+    \figureattrib{render_side_1.png}
+    \subcaptionbox{}{\includegraphics[width=\textwidth]{render_side_2.png}}
+    \figureattrib{render_side_2.png}
 
+    \caption{
+        Renderings of the complete offset secondary mesh assembly with interlocking labyrinth.
+    }
+\end{figure}
+\flushfigureattrib
 
 \section{Outlook}
 
diff --git a/chapter-qkd/figures/Makefile b/chapter-qkd/figures/Makefile
deleted file mode 100644
index 34359cd..0000000
--- a/chapter-qkd/figures/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-
-SUBMODULE_FIGURES := \
-	ihsm-secondary-mesh/gear_plan_1.svg \
-	ihsm-secondary-mesh/gear_plan_2.svg \
-	ihsm-secondary-mesh/gear_plan_3.svg \
-	ihsm-secondary-mesh/render_exp_1.png \
-	ihsm-secondary-mesh/render_exp_2.png \
-	ihsm-secondary-mesh/render_side_1.png \
-	ihsm-secondary-mesh/render_side_2.png \
-	ihsm-secondary-mesh/schema_wire.svg
-
-
-.ONESHELL:
-
-all: pull-submodules $(notdir SUBMODULE_FIGURES)
-
-pull-submodules:
-	git -C ihsm-secondary-mesh pull
-
-$(notdir SUBMODULE_FIGURES):
-	@for f in ${SUBMODULE_FIGURES}; do
-		FIG_FN="$$(basename "$$f")"
-		FIG_DIR="$$(dirname "$$f")"
-		cp "$$f" "$$FIG_FN"
-		git -C "$$FIG_DIR" remote get-url $$(git -C "$$FIG_DIR" config "branch.$$(git -C "$$FIG_DIR" branch --show-current).remote") > "$${FIG_FN}.git_remote"
-		git -C "$$FIG_DIR" describe --always --tags > "$${FIG_FN}.git_rev"
-	done
-
diff --git a/chapter-qkd/figures/gear_plan_1.svg.git_remote b/chapter-qkd/figures/gear_plan_1.svg.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/gear_plan_1.svg.git_remote
+++ b/chapter-qkd/figures/gear_plan_1.svg.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/gear_plan_1.svg.git_rev b/chapter-qkd/figures/gear_plan_1.svg.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/gear_plan_1.svg.git_rev
+++ b/chapter-qkd/figures/gear_plan_1.svg.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/gear_plan_2.svg.git_remote b/chapter-qkd/figures/gear_plan_2.svg.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/gear_plan_2.svg.git_remote
+++ b/chapter-qkd/figures/gear_plan_2.svg.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/gear_plan_2.svg.git_rev b/chapter-qkd/figures/gear_plan_2.svg.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/gear_plan_2.svg.git_rev
+++ b/chapter-qkd/figures/gear_plan_2.svg.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/gear_plan_3.svg.git_remote b/chapter-qkd/figures/gear_plan_3.svg.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/gear_plan_3.svg.git_remote
+++ b/chapter-qkd/figures/gear_plan_3.svg.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/gear_plan_3.svg.git_rev b/chapter-qkd/figures/gear_plan_3.svg.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/gear_plan_3.svg.git_rev
+++ b/chapter-qkd/figures/gear_plan_3.svg.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_exp_1.png.git_remote b/chapter-qkd/figures/render_exp_1.png.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/render_exp_1.png.git_remote
+++ b/chapter-qkd/figures/render_exp_1.png.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_exp_1.png.git_rev b/chapter-qkd/figures/render_exp_1.png.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/render_exp_1.png.git_rev
+++ b/chapter-qkd/figures/render_exp_1.png.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_exp_2.png.git_remote b/chapter-qkd/figures/render_exp_2.png.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/render_exp_2.png.git_remote
+++ b/chapter-qkd/figures/render_exp_2.png.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_exp_2.png.git_rev b/chapter-qkd/figures/render_exp_2.png.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/render_exp_2.png.git_rev
+++ b/chapter-qkd/figures/render_exp_2.png.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_side_1.png.git_remote b/chapter-qkd/figures/render_side_1.png.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/render_side_1.png.git_remote
+++ b/chapter-qkd/figures/render_side_1.png.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_side_1.png.git_rev b/chapter-qkd/figures/render_side_1.png.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/render_side_1.png.git_rev
+++ b/chapter-qkd/figures/render_side_1.png.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_side_2.png.git_remote b/chapter-qkd/figures/render_side_2.png.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/render_side_2.png.git_remote
+++ b/chapter-qkd/figures/render_side_2.png.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/render_side_2.png.git_rev b/chapter-qkd/figures/render_side_2.png.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/render_side_2.png.git_rev
+++ b/chapter-qkd/figures/render_side_2.png.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file
diff --git a/chapter-qkd/figures/schema_wire.svg.git_remote b/chapter-qkd/figures/schema_wire.svg.git_remote
index 348bdfd..1d4c356 100644
--- a/chapter-qkd/figures/schema_wire.svg.git_remote
+++ b/chapter-qkd/figures/schema_wire.svg.git_remote
@@ -1 +1 @@
-git@git.jaseg.de:ihsm-secondary-mesh.git
+git@git.jaseg.de:ihsm-secondary-mesh.git
\ No newline at end of file
diff --git a/chapter-qkd/figures/schema_wire.svg.git_rev b/chapter-qkd/figures/schema_wire.svg.git_rev
index 32bd4d4..8100ebc 100644
--- a/chapter-qkd/figures/schema_wire.svg.git_rev
+++ b/chapter-qkd/figures/schema_wire.svg.git_rev
@@ -1 +1 @@
-3a7edbd
+3a7edbd
\ No newline at end of file