diff --git a/Dockerfile b/Dockerfile
index 41d8e37..3a77ace 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 
 # Installing tools needed for rpmbuild , 
 # depends on BuildRequires field in specfile, (TODO: take as input & install)
-RUN yum install -y rpm-build rpmdevtools gcc make coreutils python
+RUN yum install -y rpm-build rpmdevtools gcc make coreutils python git
 
 # Setting up node to run our JS file
 # Download Node Linux binary
diff --git a/lib/main.js b/lib/main.js
index ff55351..e302b3e 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -45,18 +45,11 @@ function run() {
             yield exec.exec('rpmdev-setuptree');
             // Copy spec file from path specFile to /root/rpmbuild/SPECS/
             yield exec.exec(`cp /github/workspace/${specFile} /github/home/rpmbuild/SPECS/`);
-            // Dowload tar.gz file of source code,  Reference : https://developer.github.com/v3/repos/contents/#get-archive-link
-            yield exec.exec(`curl -L --output tmp.tar.gz https://api.github.com/repos/${owner}/${repo}/tarball/${ref}`);
-            // create directory to match source file - %{name}-{version}.tar.gz of spec file
-            yield exec.exec(`mkdir ${name}-${version}`);
-            // Extract source code 
-            yield exec.exec(`tar xvf tmp.tar.gz -C ${name}-${version} --strip-components 1`);
-            // Create Source tar.gz file 
-            yield exec.exec(`tar -czvf ${name}-${version}.tar.gz ${name}-${version}`);
-            // // list files in current directory /github/workspace/
-            // await exec.exec('ls -la ');
-            // Copy tar.gz file to source path
-            yield exec.exec(`cp ${name}-${version}.tar.gz /github/home/rpmbuild/SOURCES/`);
+            // Make the code in /github/workspace/ into a tar.gz, located in /github/home/rpmbuild/SOURCES/
+            const oldGitDir = process.env.GIT_DIR;
+            process.env.GIT_DIR = '/github/workspace/.git';
+            yield exec.exec(`git archive --output=/github/home/rpmbuild/SOURCES/${name}-${version}.tar.gz --prefix=${name}-${version}/ HEAD`);
+            process.env.GIT_DIR = oldGitDir;
             // Execute rpmbuild , -ba generates both RPMS and SPRMS
             try {
                 yield exec.exec(`rpmbuild -ba /github/home/rpmbuild/SPECS/${specFile}`);
diff --git a/src/main.ts b/src/main.ts
index 14bc6c3..737cb00 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -43,23 +43,11 @@ async function run() {
     // Copy spec file from path specFile to /root/rpmbuild/SPECS/
     await exec.exec(`cp /github/workspace/${specFile} /github/home/rpmbuild/SPECS/`);
 
-    // Dowload tar.gz file of source code,  Reference : https://developer.github.com/v3/repos/contents/#get-archive-link
-    await exec.exec(`curl -L --output tmp.tar.gz https://api.github.com/repos/${owner}/${repo}/tarball/${ref}`)
-
-    // create directory to match source file - %{name}-{version}.tar.gz of spec file
-    await exec.exec(`mkdir ${name}-${version}`);
-
-    // Extract source code 
-    await exec.exec(`tar xvf tmp.tar.gz -C ${name}-${version} --strip-components 1`);
-
-    // Create Source tar.gz file 
-    await exec.exec(`tar -czvf ${name}-${version}.tar.gz ${name}-${version}`);
-
-    // // list files in current directory /github/workspace/
-    // await exec.exec('ls -la ');
-
-    // Copy tar.gz file to source path
-    await exec.exec(`cp ${name}-${version}.tar.gz /github/home/rpmbuild/SOURCES/`);
+    // Make the code in /github/workspace/ into a tar.gz, located in /github/home/rpmbuild/SOURCES/
+    const oldGitDir = process.env.GIT_DIR;
+    process.env.GIT_DIR = '/github/workspace/.git';
+    await exec.exec(`git archive --output=/github/home/rpmbuild/SOURCES/${name}-${version}.tar.gz --prefix=${name}-${version}/ HEAD`);
+    process.env.GIT_DIR = oldGitDir;
 
     // Execute rpmbuild , -ba generates both RPMS and SPRMS
     try {