diff --git a/helpers/DATA/fai-server/sources.list b/helpers/DATA/fai-server/sources.list
new file mode 100644
index 0000000000000000000000000000000000000000..5b5bf6c0ddfef7394afb54b627004f7a2cbcd326
--- /dev/null
+++ b/helpers/DATA/fai-server/sources.list
@@ -0,0 +1,13 @@
+# Trisquel repositories for supported software and updates
+
+deb https://archive.trisquel.info/trisquel etiona main
+#deb-src https://archive.trisquel.info/trisquel etiona main
+
+deb https://archive.trisquel.info/trisquel etiona-updates main
+#deb-src https://archive.trisquel.info/trisquel etiona-updates main
+
+deb https://archive.trisquel.info/trisquel etiona-security main
+#deb-src https://archive.trisquel.info/trisquel etiona-security main
+
+#deb https://archive.trisquel.info/trisquel etiona-backports main
+#deb-src https://archive.trisquel.info/trisquel etiona-backports main
diff --git a/helpers/make-fai-server b/helpers/make-fai-server
new file mode 100644
index 0000000000000000000000000000000000000000..770e6fcd6851755c92bce6e6db03409cd521004a
--- /dev/null
+++ b/helpers/make-fai-server
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+#    Copyright (C) 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+cp $DATA/sources.list conf/sources.list
+
+sed 's#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP="etiona http://archive.trisquel.info/trisquel"#' \
+    -i conf/nfsroot.conf
+
+sed 's/linux-image-server/linux-image-generic/g' -i conf/NFSROOT
+
+changelog "Replace Ubuntu sources.list, packages repository url and specific packages by Trisquel's"
+
+compile
diff --git a/helpers/make-proguard b/helpers/make-proguard
new file mode 100644
index 0000000000000000000000000000000000000000..8b7c66f7e87422e69c3e2090979aef2ed369f96e
--- /dev/null
+++ b/helpers/make-proguard
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+#    Copyright (C) 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed \
+    's#^exec java #exec /usr/lib/jvm/java-11-openjdk-amd64/bin/java #' \
+    -i ./debian/scripts/proguard
+
+sed 's/default-jre/openjdk-11-jre/g' -i debian/control
+
+changelog "Always use Java 11 because Trisquel 9 also has Java 8 which can't run classes compiled by Java 11"
+
+compile