diff --git a/b/Bazel/Bazel-0.5.0-GCC-7.1.0-2.28.eb b/b/Bazel/Bazel-0.5.0-GCC-7.1.0-2.28.eb
new file mode 100644
index 00000000..e8bf93bc
--- /dev/null
+++ b/b/Bazel/Bazel-0.5.0-GCC-7.1.0-2.28.eb
@@ -0,0 +1,31 @@
+# @author: Robert Schmidt (OHRI)
+# @author: Guilherme Peretti-Pezzi (CSCS) 
+
+easyblock = "CmdCp"
+
+name = 'Bazel'
+version = '0.5.0'
+
+homepage = 'http://bazel.io/'
+description = """Bazel is a build tool that builds code quickly and reliably. 
+It is used to build the majority of Google's software."""
+
+toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
+
+sources = ['%(namelower)s-%(version)s-dist.zip']
+source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s']
+
+dependencies = [
+    ('Java', '1.8.0_121', '', True),
+]
+
+cmds_map = [('.*', "./compile.sh")]
+
+files_to_copy = [(['output/bazel'], 'bin')]
+
+sanity_check_paths={
+    'files': ['bin/bazel'],
+    'dirs':  [],
+}
+
+moduleclass = 'devel'
diff --git a/e/EasyBuild/EasyBuild-3.2.1-testovaci.eb b/e/EasyBuild/EasyBuild-3.2.1.eb
similarity index 95%
rename from e/EasyBuild/EasyBuild-3.2.1-testovaci.eb
rename to e/EasyBuild/EasyBuild-3.2.1.eb
index 4b84d271..ac928a95 100644
--- a/e/EasyBuild/EasyBuild-3.2.1-testovaci.eb
+++ b/e/EasyBuild/EasyBuild-3.2.1.eb
@@ -2,14 +2,13 @@ easyblock = 'EB_EasyBuildMeta'
 
 name = 'EasyBuild'
 version = '3.2.1'
-versionsuffix= '-TEST'
 
 homepage = 'http://hpcugent.github.com/easybuild/'
 description = """EasyBuild is a software build and installation framework
  written in Python that allows you to install software in a structured,
  repeatable and robust way."""
 
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = [
     # vsc-install