diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52b4adfd..d6581504 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build-make:
     name: Make with USE_UPNP=${{ matrix.with_upnp }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: true
       matrix:
@@ -14,14 +14,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: install packages
       run: |
-        sudo add-apt-repository ppa:mhier/libboost-latest
         sudo apt-get update
-        sudo apt-get install build-essential libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
+        sudo apt-get install build-essential libboost-all-dev libminiupnpc-dev libssl-dev zlib1g-dev
     - name: build application
       run: make USE_UPNP=${{ matrix.with_upnp }} -j3
   build-cmake:
     name: CMake with -DWITH_UPNP=${{ matrix.with_upnp }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: true
       matrix:
@@ -30,9 +29,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: install packages
       run: |
-        sudo add-apt-repository ppa:mhier/libboost-latest
         sudo apt-get update
-        sudo apt-get install build-essential cmake libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
+        sudo apt-get install build-essential cmake libboost-all-dev libminiupnpc-dev libssl-dev zlib1g-dev
     - name: build application
       run: |
         cd build
@@ -40,7 +38,7 @@ jobs:
         make -j3
   build-static:
     name: Static build with UPnP
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: install packages
@@ -52,5 +50,5 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: i2pd-static-linux-x86_64
+        name: i2pd-amd64-static
         path: i2pd
diff --git a/Makefile.linux b/Makefile.linux
index 4098ad1f..49090c06 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -33,15 +33,6 @@ endif
 
 NEEDED_CXXFLAGS += -fPIC
 
-# NOTE: on glibc you will get this warning:
-#   Using 'getaddrinfo' in statically linked applications requires at runtime
-#   the shared libraries from the glibc version used for linking
-ifeq ($(USE_STATIC),yes)
-	LDLIBS += -ldl -Wl,-Bstatic -pthread -static-libgcc -static-libstdc++
-else
-	LDLIBS += -lpthread
-endif
-
 LDLIBS += -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lssl -lcrypto -lz
 
 # UPNP Support (miniupnpc 1.5 and higher)
@@ -50,6 +41,15 @@ ifeq ($(USE_UPNP),yes)
 	NEEDED_CXXFLAGS += -DUSE_UPNP
 endif
 
+# NOTE: on glibc you will get this warning:
+#   Using 'getaddrinfo' in statically linked applications requires at runtime
+#   the shared libraries from the glibc version used for linking
+ifeq ($(USE_STATIC),yes)
+	LDLIBS += -static -ldl -lpthread -static-libgcc -static-libstdc++
+else
+	LDLIBS += -lpthread
+endif
+
 ifeq ($(USE_AESNI),yes)
 ifneq (, $(findstring i386, $(SYS))$(findstring i686, $(SYS))$(findstring x86_64, $(SYS))) # only x86-based CPU supports that
 	NEEDED_CXXFLAGS += -D__AES__ -maes