diff --git a/bin/storlets-daemon b/bin/storlets-daemon
new file mode 100755
index 00000000..b6eebd50
--- /dev/null
+++ b/bin/storlets-daemon
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from storlets.agent.daemon.server import main
+
+
+if __name__ == '__main__':
+    main()
diff --git a/bin/storlets-daemon-factory b/bin/storlets-daemon-factory
new file mode 100755
index 00000000..0ff38356
--- /dev/null
+++ b/bin/storlets-daemon-factory
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from storlets.agent.daemon_factory.server import main
+
+
+if __name__ == '__main__':
+    main()
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e4c94bce..905e55f8 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -211,7 +211,7 @@ function install_storlets_code {
     pip_install . -t /usr/local/lib/storlets/python --no-compile --no-deps
     sudo mkdir -p -m 755 /usr/local/libexec/storlets
     for bin_file in storlets-daemon storlets-daemon-factory ; do
-        sudo cp `which ${bin_file}` /usr/local/libexec/storlets/
+        sudo cp ./bin/${bin_file} /usr/local/libexec/storlets/
     done
 
     sudo mkdir -p -m 0755 $STORLETS_DOCKER_DEVICE
diff --git a/setup.cfg b/setup.cfg
index 3837fcdd..5d9f7b7f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,6 +31,10 @@ skip_changelog = True
 packages =
     storlets
 
+scripts =
+    bin/storlets-daemon
+    bin/storlets-daemon-factory
+
 [entry_points]
 paste.filter_factory =
     storlet_handler = storlets.swift_middleware.storlet_handler:filter_factory
@@ -41,8 +45,6 @@ storlets.gateways =
 
 console_scripts =
     sbus = storlets.sbus.cli:main
-    storlets-daemon = storlets.agent.daemon.server:main
-    storlets-daemon-factory = storlets.agent.daemon_factory.server:main
 
 [codespell]
 quiet-level = 4