diff --git a/Makefile b/Makefile
index 64f9307..922d2fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 .EXPORT_ALL_VARIABLES:
 
-TOR_VERSION = $(shell bash last_tor_version.sh)
-TORSOCKS_VERSION = $(shell bash last_torsocks_version.sh)
+LAST_TOR_VERSION = $(shell bash last_tor_version.sh)
+LAST_TORSOCKS_VERSION = $(shell bash last_torsocks_version.sh)
+TOR_VERSION = $(shell cat current_tor_version)
+TORSOCKS_VERSION = $(shell cat current_torsock_version)
 CUR_COMMIT = $(shell git rev-parse --short HEAD)
 CUR_TAG = v$(TOR_VERSION)-$(CUR_COMMIT)
 
@@ -11,6 +13,10 @@ test:
 tag:
 	git tag $(CUR_TAG)
 
+update_tor_version:
+	echo $(LAST_TOR_VERSION) > current_tor_version
+	echo $(LAST_TORSOCKS_VERSION) > current_torsock_version
+
 release: test tag
 	git push origin --tags
 
@@ -19,11 +25,13 @@ check:
 
 build:
 	- echo build with tor version $(TOR_VERSION) and torsocks version $(TORSOCKS_VERSION)
+	- echo 'Please run make update_tor_version to build the container with the last tor version'
 	docker-compose -f docker-compose.build.yml build
 
 rebuild:
 	- echo rebuild with tor version $(TOR_VERSION) and torsocks version $(TORSOCKS_VERSION)
-	docker-compose -f docker-compose.build.yml build --no-cache
+	- echo 'Please run make update_tor_version to build the container with the last tor version'
+	docker-compose -f docker-compose.build.yml build --no-cache --pull
 
 run: build
 	docker-compose -f docker-compose.v1.yml up --force-recreate
diff --git a/current_tor_version b/current_tor_version
new file mode 100644
index 0000000..3eed24b
--- /dev/null
+++ b/current_tor_version
@@ -0,0 +1 @@
+0.4.4.7
diff --git a/current_torsock_version b/current_torsock_version
new file mode 100644
index 0000000..b1d18bc
--- /dev/null
+++ b/current_torsock_version
@@ -0,0 +1 @@
+v2.3.0
diff --git a/onions/Onions.py b/onions/Onions.py
index a7bcc9b..d3df662 100644
--- a/onions/Onions.py
+++ b/onions/Onions.py
@@ -198,7 +198,8 @@ class Setup(object):
         for reg, call in match_map:
             for key, val in os.environ.items():
                 m = match(reg, key)
-                # Ignore GPG_KEY env variable to avoid warning (this is a deprecated setup)
+                # Ignore GPG_KEY env variable to avoid warning
+                # (this is a deprecated setup)
                 if m and key != 'GPG_KEY':
                     try:
                         call(m.groups()[0].lower(), val)