diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2b0e62d..8d027ce 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,6 +23,7 @@
                 "files.eol": "\n",
                 // Latex settings
                 "latex-workshop.linting.chktex.enabled": true,
+                "latex-workshop.latex.recipe.default": "latexmk",
                 "latex-workshop.linting.chktex.exec.path": "chktex",
                 "latex-workshop.latex.clean.subfolder.enabled": true,
                 "latex-workshop.latex.autoClean.run": "onBuilt",
@@ -30,6 +31,58 @@
                 "files.associations": {
                     "*.tex": "latex"
                 },
+                "latex-workshop.latex.recipes": [
+                    {
+                        "name": "latexmk",
+                        "tools": [
+                            "texliveonfly",
+                            "latexmk"
+                        ]
+                    },
+                    {
+                        "name": "latexmk (lualatex)",
+                        "tools": [
+                            "texliveonfly-lualatex",
+                            "latexmk-lualatex"
+                        ]
+                    }
+                ],
+                "latex-workshop.latex.tools": [
+                    {
+                        "name": "texliveonfly",
+                        "command": "texliveonfly",
+                        "args": [
+                            "%DOC%.tex"
+                        ]
+                    },
+                    {
+                        "name": "texliveonfly-lualatex",
+                        "command": "texliveonfly",
+                        "args": [
+                            "--compiler=lualatex", // if you want to have the shell-escape flag
+                            "%DOC%.tex"
+                        ]
+                    },
+                    {
+                        "name": "latexmk",
+                        "command": "latexmk",
+                        "args": [
+                            "-synctex=1", // if you want to have the shell-escape flag
+                            "-interaction=nonstopmode",
+                            "%DOC%.tex"
+                        ]
+                    },
+                    {
+                        "name": "latexmk-lualatex",
+                        "command": "latexmk",
+                        "args": [
+                            "-lualatex",
+                            "-synctex=1", // if you want to have the shell-escape flag
+                            "-interaction=nonstopmode",
+                            "%DOC%.tex"
+                        ]
+                    }
+                ],
                 "latex-workshop.latexindent.path": "latexindent",
                 "latex-workshop.latexindent.args": [
                     "-c",
diff --git a/Dockerfile b/Dockerfile
index f1bf6a6..a739fae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,7 @@ ENV PATH ${PATH}:\
 WORKDIR /workspace
 # Latexindent dependencies
 RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends cpanminus make gcc libc6-dev && \
+    apt-get install -y --no-install-recommends cpanminus make gcc libc6-dev python3 python-is-python3 && \
     cpanm -n -q Log::Log4perl && \
     cpanm -n -q XString && \
     cpanm -n -q Log::Dispatch::File && \
@@ -63,7 +63,7 @@ RUN apt-get update -y && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN tlmgr install latexindent latexmk && \
+RUN tlmgr install latexindent latexmk texliveonfly && \
     texhash && \
     rm /usr/local/texlive/${TEXLIVE_VERSION}/texmf-var/web2c/*.log && \
     rm /usr/local/texlive/${TEXLIVE_VERSION}/tlpkg/texlive.tlpdb.main.*