diff --git a/blambda/deploy.py b/blambda/deploy.py
index 516de0f..9d6f27b 100644
--- a/blambda/deploy.py
+++ b/blambda/deploy.py
@@ -287,7 +287,7 @@ def publish(name, role, zipfile, options, dryrun):
                 ZipFile=file_bytes
             )
             
-            time.sleep(5)
+            time.sleep(15)
 
             cprint("Updating lambda function configuration", 'yellow')
             response = client.update_function_configuration(
diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py
index 31f5e72..8e180ec 100644
--- a/blambda/utils/lambda_manifest.py
+++ b/blambda/utils/lambda_manifest.py
@@ -146,7 +146,7 @@ def source_files(self, dest_dir: Path = None):
 
                 for src in src_paths:
                     src = (self.basedir / src).resolve()
-                    dst = dest_dir / dst_pattern
+                    dst = dest_dir / self.short_name / dst_pattern
 
                     if '*' in dst.name:
                         dst = dst.parent / src.name
@@ -197,18 +197,21 @@ def process_manifest(self, clean=False, prod=False):
 
             tempdir = tempfile.mkdtemp()
             node_modules = Path(tempdir) / "node_modules"
-            node_modules.symlink_to(self.node_dir)
+            # node_modules.symlink_to(self.node_dir)
+            os.system(f"ln -s {node_modules} {self.node_dir}")
 
             if clean and self.node_dir.exists():
                 shutil.rmtree(self.node_dir)
 
-            self.node_dir.mkdir(exist_ok=True)
+            # self.node_dir.mkdir(exist_ok=True)
 
             # install node dependencies 1 at a time to avoid race condition issues
             for dependency, version in deps_to_install.items():
                 spawn(f"npm install {dependency}@{version}", show=True, working_directory=tempdir)
 
-            shutil.rmtree(tempdir)
+            # Commenting below line because symlink is created to temp directory and
+            # While deploying lambda it is trying to copy content from symlinked dir.
+            # shutil.rmtree(tempdir)
 
         else:
             raise RuntimeError("Unknown runtime: " + self.runtime)
diff --git a/setup.py b/setup.py
index d75d977..e133e48 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
       author='Balihoo Developers',
       author_email='devall@balihoo.com',
       license='MIT',
-      url='git@github.com:balihoo/fulfillment-lambda-functions.git',
+      url='git+https://github.com/balihoo/fulfillment-lambda-functions.git',
       install_requires=['boto3', 'python-dateutil', 'requests', 'termcolor', 'lxml', 'beautifulsoup4'],
       packages=find_packages(exclude=['tests']),
       include_package_data=True,